Merge pull request #10833 from wordpress-mobile/issue/10832-fix-npe-in-login-fragment

Fixed NPE in LoginUsernamePasswordFragment

Author: planarvoid

WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java

@@ -54,6 +54,7 @@
 public class LoginUsernamePasswordFragment extends LoginBaseDiscoveryFragment implements TextWatcher,
         OnEditorCommitListener, LoginBaseDiscoveryFragment.LoginBaseDiscoveryListener {
     private static final String KEY_LOGIN_FINISHED = "KEY_LOGIN_FINISHED";
+    private static final String KEY_LOGIN_STARTED = "KEY_LOGIN_STARTED";
     private static final String KEY_REQUESTED_USERNAME = "KEY_REQUESTED_USERNAME";
     private static final String KEY_REQUESTED_PASSWORD = "KEY_REQUESTED_PASSWORD";
     private static final String KEY_OLD_SITES_IDS = "KEY_OLD_SITES_IDS";
@@ -77,6 +78,7 @@ public class LoginUsernamePasswordFragment extends LoginBaseDiscoveryFragment im
 
     private boolean mAuthFailed;
     private boolean mLoginFinished;
+    private boolean mLoginStarted;
 
     private String mRequestedUsername;
     private String mRequestedPassword;
@@ -241,6 +243,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         if (savedInstanceState != null) {
             mLoginFinished = savedInstanceState.getBoolean(KEY_LOGIN_FINISHED);
+            mLoginStarted = savedInstanceState.getBoolean(KEY_LOGIN_STARTED);
 
             mRequestedUsername = savedInstanceState.getString(KEY_REQUESTED_USERNAME);
             mRequestedPassword = savedInstanceState.getString(KEY_REQUESTED_PASSWORD);
@@ -266,6 +269,7 @@ public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
         outState.putBoolean(KEY_LOGIN_FINISHED, mLoginFinished);
+        outState.putBoolean(KEY_LOGIN_STARTED, mLoginStarted);
         outState.putString(KEY_REQUESTED_USERNAME, mRequestedUsername);
         outState.putString(KEY_REQUESTED_PASSWORD, mRequestedPassword);
         outState.putIntegerArrayList(KEY_OLD_SITES_IDS, mOldSitesIDs);
@@ -291,6 +295,7 @@ protected void next() {
             return;
         }
 
+        mLoginStarted = true;
         startProgress();
 
         mRequestedUsername = getCleanedUsername();
@@ -509,6 +514,7 @@ public void onAuthenticationChanged(OnAuthenticationChanged event) {
         }
 
         if (event.isError()) {
+            mLoginStarted = false;
             if (mRequestedUsername == null) {
                 // just bail since the operation was cancelled
                 return;
@@ -563,11 +569,12 @@ private void finishLogin() {
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onSiteChanged(OnSiteChanged event) {
-        if (!isAdded() || mLoginFinished) {
+        if (!isAdded() || mLoginFinished || !mLoginStarted) {
             return;
         }
 
         if (event.isError()) {
+            mLoginStarted = false;
             if (mRequestedUsername == null) {
                 // just bail since the operation was cancelled
                 return;