Perform the WPCOM email+password login in the background

WordPress/src/main/AndroidManifest.xml

@@ -135,7 +135,7 @@
         <activity
             android:name=".ui.accounts.NewBlogActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/SignInTheme"
+            android:theme="@style/LoginTheme"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.accounts.HelpActivity"
@@ -535,6 +535,10 @@
             android:name=".ui.notifications.services.NotificationsUpdateService"
             android:exported="false"
             android:label="Notifications Update Service" />
+        <service
+            android:name=".ui.accounts.login.LoginWpcomService"
+            android:exported="false"
+            android:label="Login to WPCOM Service" />
 
         <!-- Samsung multiwindow support -->
         <uses-library

WordPress/src/main/java/org/wordpress/android/WordPress.java

@@ -610,6 +610,26 @@ public static Object getBuildConfigValue(Application application, String fieldNa
         }
     }
 
+    /**
+     * Gets a field from the project's BuildConfig using reflection. This is useful when flavors
+     * are used at the project level to set custom fields.
+     * based on: https://code.google.com/p/android/issues/detail?id=52962#c38
+     * @param activity            Used to get the Application instance
+     * @param configValueName     The name of the field-to-access
+     * @return                    The string value of the field, or empty string if the field is not found.
+     */
+    public static String getBuildConfigString(Activity activity, String configValueName) {
+        if (!BuildConfig.DEBUG) return "";
+
+        String value = (String) WordPress.getBuildConfigValue(activity.getApplication(), configValueName);
+        if (!TextUtils.isEmpty(value)) {
+            AppLog.d(AppLog.T.NUX, "Auto-filled from build config: " + configValueName);
+            return value;
+        }
+
+        return "";
+    }
+
     /**
      * Detect when the app goes to the background and come back to the foreground.
      *

WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java

@@ -31,6 +31,7 @@
 import org.wordpress.android.ui.accounts.login.LoginSiteAddressFragment;
 import org.wordpress.android.ui.accounts.login.LoginSiteAddressHelpDialogFragment;
 import org.wordpress.android.ui.accounts.login.LoginUsernamePasswordFragment;
+import org.wordpress.android.ui.accounts.login.LoginWpcomService;
 import org.wordpress.android.ui.comments.CommentAdapter;
 import org.wordpress.android.ui.comments.CommentDetailFragment;
 import org.wordpress.android.ui.comments.CommentsActivity;
@@ -136,6 +137,7 @@ public interface AppComponent {
     void inject(PostUploadHandler object);
 
     void inject(LoginActivity object);
+    void inject(LoginWpcomService object);
     void inject(LoginMagicLinkRequestFragment object);
     void inject(LoginEmailFragment object);
     void inject(LoginGoogleFragment object);

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

@@ -279,7 +279,6 @@ public static void viewSSLCerts(Context context, String certificateString) {
 
     public static void newBlogForResult(Activity activity) {
         Intent intent = new Intent(activity, NewBlogActivity.class);
-        intent.putExtra(NewBlogActivity.KEY_START_MODE, NewBlogActivity.CREATE_BLOG);
         activity.startActivityForResult(intent, RequestCodes.CREATE_SITE);
     }
 

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginBaseFormFragment.java

@@ -210,11 +210,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     protected void startProgress() {
+        startProgress(true);
+    }
+
+    protected void startProgress(boolean cancellable) {
         mPrimaryButton.setEnabled(false);
         mSecondaryButton.setEnabled(false);
 
         mProgressDialog =
-                ProgressDialog.show(getActivity(), "", getActivity().getString(getProgressBarText()), true, true,
+                ProgressDialog.show(getActivity(), "", getActivity().getString(getProgressBarText()), true, cancellable,
                         new DialogInterface.OnCancelListener() {
                             @Override
                             public void onCancel(DialogInterface dialogInterface) {
@@ -256,7 +260,7 @@ protected void doFinishLogin() {
     protected void onLoginFinished() {
     }
 
-    private void onLoginFinished(boolean success) {
+    protected void onLoginFinished(boolean success) {
         mLoginFinished = true;
 
         if (!success) {

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEmailPasswordFragment.java

@@ -19,18 +19,13 @@
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
-import org.wordpress.android.fluxc.generated.AccountActionBuilder;
-import org.wordpress.android.fluxc.generated.AuthenticationActionBuilder;
-import org.wordpress.android.fluxc.store.AccountStore;
-import org.wordpress.android.fluxc.store.AccountStore.AuthenticatePayload;
-import org.wordpress.android.fluxc.store.AccountStore.OnAuthenticationChanged;
-import org.wordpress.android.fluxc.store.AccountStore.OnSocialChanged;
-import org.wordpress.android.util.AnalyticsUtils;
+import org.wordpress.android.ui.accounts.login.LoginWpcomService.OnCredentialsOK;
+import org.wordpress.android.ui.accounts.login.LoginWpcomService.OnLoginStateUpdated;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.AutoForeground;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.SiteUtils;
-import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.widgets.WPLoginInputRow;
 import org.wordpress.android.widgets.WPLoginInputRow.OnEditorCommitListener;
 
@@ -62,6 +57,8 @@ public class LoginEmailPasswordFragment extends LoginBaseFormFragment<LoginListe
     private String mService;
     private boolean isSocialLogin;
 
+    private AutoForeground.ServiceEventConnection mServiceEventConnection;
+
     public static LoginEmailPasswordFragment newInstance(String emailAddress, String password,
                                                          String idToken, String service,
                                                          boolean isSocialLogin) {
@@ -87,11 +84,39 @@ public void onCreate(Bundle savedInstanceState) {
         mService = getArguments().getString(ARG_SOCIAL_SERVICE);
         isSocialLogin = getArguments().getBoolean(ARG_SOCIAL_LOGIN);
 
-        if (savedInstanceState != null) {
+        if (savedInstanceState == null) {
+            // cleanup the service state on first appearance
+            LoginWpcomService.clearLoginServiceState();
+        } else {
             mRequestedPassword = savedInstanceState.getString(KEY_REQUESTED_PASSWORD);
         }
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // connect to the Service. We'll receive updates via EventBus.
+        mServiceEventConnection = new AutoForeground.ServiceEventConnection(getContext(), LoginWpcomService.class, this);
+
+        // install the change listener as late as possible so the UI can be setup (updated from the Service state)
+        //  before triggering the state cleanup happening in the change listener.
+        mPasswordInput.addTextChangedListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        // disconnect from the Service
+        mServiceEventConnection.disconnect(getContext(), this);
+    }
+
+    @Override
+    protected boolean listenForLogin() {
+        return false;
+    }
+
     @Override
     protected @LayoutRes
     int getContentLayout() {
@@ -113,7 +138,6 @@ protected void setupContent(ViewGroup rootView) {
         ((TextView) rootView.findViewById(R.id.login_email)).setText(mEmailAddress);
 
         mPasswordInput = (WPLoginInputRow) rootView.findViewById(R.id.login_password_row);
-        mPasswordInput.addTextChangedListener(this);
         mPasswordInput.setOnEditorCommitListener(this);
     }
 
@@ -177,14 +201,13 @@ protected void next() {
             return;
         }
 
-        startProgress();
+        startProgress(false);
 
         mRequestedPassword = mPasswordInput.getEditText().getText().toString();
 
+        LoginWpcomService.loginWithEmailAndPassword(getContext(), mEmailAddress, mRequestedPassword, mIdToken, mService,
+                isSocialLogin);
         mOldSitesIDs = SiteUtils.getCurrentSiteIds(mSiteStore, false);
-
-        AuthenticatePayload payload = new AuthenticatePayload(mEmailAddress, mRequestedPassword);
-        mDispatcher.dispatch(AuthenticationActionBuilder.newAuthenticateAction(payload));
     }
 
     @Override
@@ -204,107 +227,84 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
         mPasswordInput.setError(null);
+
+        LoginWpcomService.clearLoginServiceState();
     }
 
     private void showPasswordError() {
         mPasswordInput.setError(getString(R.string.password_incorrect));
     }
 
-    private void handleAuthError(AccountStore.AuthenticationErrorType error, String errorMessage) {
-
-        if (error != AccountStore.AuthenticationErrorType.NEEDS_2FA) {
-            AnalyticsTracker.track(AnalyticsTracker.Stat.LOGIN_FAILED, error.getClass().getSimpleName(), error.toString(), errorMessage);
-
-            if (isSocialLogin) {
-                AnalyticsTracker.track(AnalyticsTracker.Stat.LOGIN_SOCIAL_FAILURE, error.getClass().getSimpleName(), error.toString(), errorMessage);
-            }
-        }
-
-        switch (error) {
-            case INCORRECT_USERNAME_OR_PASSWORD:
-            case NOT_AUTHENTICATED: // NOT_AUTHENTICATED is the generic error from XMLRPC response on first call.
-                showPasswordError();
-                break;
-            case NEEDS_2FA:
-                // login credentials were correct anyway so, offer to save to SmartLock
-                saveCredentialsInSmartLock(mLoginListener.getSmartLockHelper(), mEmailAddress, mPassword);
-
-                if (isSocialLogin) {
-                    mLoginListener.needs2faSocialConnect(mEmailAddress, mRequestedPassword, mIdToken, mService);
-                } else {
-                    mLoginListener.needs2fa(mEmailAddress, mRequestedPassword);
-                }
-
-                break;
-            case INVALID_REQUEST:
-                // TODO: FluxC: could be specific?
-            default:
-                AppLog.e(T.NUX, "Server response: " + errorMessage);
-
-                ToastUtils.showToast(getActivity(),
-                        errorMessage == null ? getString(R.string.error_generic) : errorMessage);
-                break;
-        }
+    private void showError(String error) {
+        mPasswordInput.setError(error);
     }
 
-    // OnChanged events
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onAuthenticationChanged(OnAuthenticationChanged event) {
-        if (event.isError()) {
-            endProgress();
-
-            AppLog.e(T.API, "onAuthenticationChanged has error: " + event.error.type + " - " + event.error.message);
-
-            if (isAdded()) {
-                handleAuthError(event.error.type, event.error.message);
-            }
-
-            return;
-        }
-
-        AppLog.i(T.NUX, "onAuthenticationChanged: " + event.toString());
-
+    @Override
+    protected void onLoginFinished() {
         if (isSocialLogin) {
-            AccountStore.PushSocialLoginPayload payload = new AccountStore.PushSocialLoginPayload(mIdToken, mService);
-            mDispatcher.dispatch(AccountActionBuilder.newPushSocialConnectAction(payload));
+            mLoginListener.loggedInViaSocialAccount(mOldSitesIDs);
         } else {
-            saveCredentialsInSmartLock(mLoginListener.getSmartLockHelper(), mEmailAddress, mRequestedPassword);
-            doFinishLogin();
+            mLoginListener.loggedInViaPassword(mOldSitesIDs);
         }
     }
 
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onSocialChanged(OnSocialChanged event) {
-        if (event.isError()) {
-            AnalyticsTracker.track(AnalyticsTracker.Stat.LOGIN_SOCIAL_CONNECT_FAILURE);
-            switch (event.error.type) {
-                case UNABLE_CONNECT:
-                    AppLog.e(T.API, "Unable to connect WordPress.com account to social account.");
-                    break;
-                case USER_ALREADY_ASSOCIATED:
-                    AppLog.e(T.API, "This social account is already associated with a WordPress.com account.");
-                    break;
-                // Ignore other error cases.  The above are the only two we have chosen to log.
-            }
-
-            doFinishLogin();
-        } else if (!event.requiresTwoStepAuth) {
-            AnalyticsTracker.track(AnalyticsTracker.Stat.LOGIN_SOCIAL_CONNECT_SUCCESS);
-            doFinishLogin();
-        }
+    public void onCredentialsOK(OnCredentialsOK event) {
+        saveCredentialsInSmartLock(mLoginListener.getSmartLockHelper(), mEmailAddress, mRequestedPassword);
     }
 
-    @Override
-    protected void onLoginFinished() {
-        AnalyticsUtils.trackAnalyticsSignIn(mAccountStore, mSiteStore, true);
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    public void onLoginStateUpdated(OnLoginStateUpdated event) {
+        AppLog.i(T.NUX, "Received state: " + event.state.name());
 
-        if (isSocialLogin) {
-            mLoginListener.loggedInViaSocialAccount(mOldSitesIDs);
-        } else {
-            mLoginListener.loggedInViaPassword(mOldSitesIDs);
+        switch (event.state) {
+            case IDLE:
+                // nothing special to do, we'll start the service on next()
+                break;
+            case AUTHENTICATING:
+            case SOCIAL_LOGIN:
+            case FETCHING_ACCOUNT:
+            case FETCHING_SETTINGS:
+            case FETCHING_SITES:
+                if (!isInProgress()) {
+                    startProgress();
+                }
+                break;
+            case FAILURE_EMAIL_WRONG_PASSWORD:
+                onLoginFinished(false);
+                showPasswordError();
+                break;
+            case FAILURE_2FA:
+                onLoginFinished(false);
+                mLoginListener.needs2fa(mEmailAddress, mRequestedPassword);
+
+                // consume the state so we don't relauch the 2FA dialog if user backs up
+                LoginWpcomService.clearLoginServiceState();
+                break;
+            case FAILURE_SOCIAL_2FA:
+                onLoginFinished(false);
+                mLoginListener.needs2faSocialConnect(mEmailAddress, mRequestedPassword, mIdToken, mService);
+
+                // consume the state so we don't relauch the 2FA dialog if user backs up
+                LoginWpcomService.clearLoginServiceState();
+                break;
+            case FAILURE_FETCHING_ACCOUNT:
+                onLoginFinished(false);
+                showError(getString(R.string.error_fetch_my_profile));
+                break;
+            case FAILURE_CANNOT_ADD_DUPLICATE_SITE:
+                onLoginFinished(false);
+                showError(getString(R.string.cannot_add_duplicate_site));
+                break;
+            case FAILURE:
+                onLoginFinished(false);
+                showError(getString(R.string.error_generic));
+                break;
+            case SUCCESS:
+                onLoginFinished(true);
+                break;
         }
     }
 }