Merge pull request #16 from wordpress-mobile/fix_crash_in_login_email…

…_fragment Adds non-null check to onActivityResult
wordpress-mobile · May 24, 2019 · 0f338da · 0f338da
2 parents f2fade8 + 39933e4
commit 0f338da
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...red/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java b/...red/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java
@@ -324,6 +324,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (requestCode == EMAIL_CREDENTIALS_REQUEST_CODE) {
+            if (mEmailInput == null) {
+                // Activity result received before the fragments onCreateView(), disregard result.
+                return;
+            }
             if (resultCode == RESULT_OK) {
                 Credential credential = data.getParcelableExtra(Credential.EXTRA_KEY);
                 mEmailInput.getEditText().setText(credential.getId());