@@ -66,7 +66,7 @@ public class FeedbackActivity extends AppCompatActivity {
66
66
@ Nullable private String releaseName ; // in development-mode the releaseName might be null
67
67
private CharSequence additionalFormText ;
68
68
@ Nullable private Uri screenshotUri ;
69
- private FeedbackTrigger feedbackTrigger ;
69
+ private FeedbackTrigger feedbackTrigger = FeedbackTrigger . UNKNOWN ;
70
70
71
71
@ Override
72
72
protected void onCreate (Bundle savedInstanceState ) {
@@ -78,17 +78,21 @@ protected void onCreate(Bundle savedInstanceState) {
78
78
if (savedInstanceState != null ) {
79
79
releaseName = savedInstanceState .getString (RELEASE_NAME_KEY );
80
80
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
+ }
83
85
String screenshotUriString = savedInstanceState .getString (SCREENSHOT_URI_KEY );
84
86
if (screenshotUriString != null ) {
85
87
screenshotUri = Uri .parse (screenshotUriString );
86
88
}
87
89
} else {
88
90
releaseName = getIntent ().getStringExtra (RELEASE_NAME_KEY );
89
91
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
+ }
92
96
if (getIntent ().hasExtra (SCREENSHOT_URI_KEY )) {
93
97
screenshotUri = Uri .parse (getIntent ().getStringExtra (SCREENSHOT_URI_KEY ));
94
98
}
0 commit comments