Skip to content

Commit 7e76e0c

Browse files
authored
Defend against NPE when feedback trigger param missing (#4689)
1 parent fcec213 commit 7e76e0c

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackActivity.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class FeedbackActivity extends AppCompatActivity {
6666
@Nullable private String releaseName; // in development-mode the releaseName might be null
6767
private CharSequence additionalFormText;
6868
@Nullable private Uri screenshotUri;
69-
private FeedbackTrigger feedbackTrigger;
69+
private FeedbackTrigger feedbackTrigger = FeedbackTrigger.UNKNOWN;
7070

7171
@Override
7272
protected void onCreate(Bundle savedInstanceState) {
@@ -78,17 +78,21 @@ protected void onCreate(Bundle savedInstanceState) {
7878
if (savedInstanceState != null) {
7979
releaseName = savedInstanceState.getString(RELEASE_NAME_KEY);
8080
additionalFormText = savedInstanceState.getCharSequence(ADDITIONAL_FORM_TEXT_KEY);
81-
feedbackTrigger =
82-
FeedbackTrigger.fromString(savedInstanceState.getString(FEEDBACK_TRIGGER_KEY));
81+
String feedbackTriggerKey = savedInstanceState.getString(FEEDBACK_TRIGGER_KEY);
82+
if (feedbackTriggerKey != null) {
83+
feedbackTrigger = FeedbackTrigger.fromString(feedbackTriggerKey);
84+
}
8385
String screenshotUriString = savedInstanceState.getString(SCREENSHOT_URI_KEY);
8486
if (screenshotUriString != null) {
8587
screenshotUri = Uri.parse(screenshotUriString);
8688
}
8789
} else {
8890
releaseName = getIntent().getStringExtra(RELEASE_NAME_KEY);
8991
additionalFormText = getIntent().getCharSequenceExtra(ADDITIONAL_FORM_TEXT_KEY);
90-
feedbackTrigger =
91-
FeedbackTrigger.fromString(getIntent().getStringExtra(FEEDBACK_TRIGGER_KEY));
92+
if (getIntent().hasExtra(FEEDBACK_TRIGGER_KEY)) {
93+
feedbackTrigger =
94+
FeedbackTrigger.fromString(getIntent().getStringExtra(FEEDBACK_TRIGGER_KEY));
95+
}
9296
if (getIntent().hasExtra(SCREENSHOT_URI_KEY)) {
9397
screenshotUri = Uri.parse(getIntent().getStringExtra(SCREENSHOT_URI_KEY));
9498
}

0 commit comments

Comments
 (0)