Merge "Remove the EmailFlowController"

Author: Aaron Mandle

auth/src/main/java/com/firebase/ui/auth/choreographer/email/EmailFlowController.java

@@ -3,6 +3,7 @@
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.StringRes;
 import android.util.Log;
 
 import com.firebase.ui.auth.AuthFlowFactory;
@@ -24,7 +25,7 @@ public abstract class NoControllerBaseActivity extends android.support.v7.app.Ap
 
     // TODO once the controller-centric BaseActivity is gone this will no longer be duplicate code
     private ProgressDialog mProgressDialog;
-    private void dismissDialog() {
+    protected void dismissDialog() {
         if (mProgressDialog != null && mProgressDialog.isShowing()) {
             mProgressDialog.dismiss();
             mProgressDialog = null;
@@ -36,6 +37,10 @@ protected void showLoadingDialog(String message) {
         mProgressDialog = ProgressDialog.show(this, "", message, true);
     }
 
+    protected void showLoadingDialog(@StringRes int stringResource) {
+        showLoadingDialog(getString(stringResource));
+    }
+
     @Override
     protected void onCreate(Bundle savedInstance) {
         super.onCreate(savedInstance);

auth/src/main/java/com/firebase/ui/auth/choreographer/email/EmailFlowControllerTransitions.java

@@ -46,7 +46,7 @@ public class AccountLinkInitActivity extends NoControllerBaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        showLoadingDialog(getResources().getString(R.string.progress_dialog_loading));
+        showLoadingDialog(R.string.progress_dialog_loading);
         mApiWrapper = FirebaseAuthWrapperFactory.getFirebaseAuthWrapper(mAppName);
         String email = getIntent().getStringExtra(ControllerConstants.EXTRA_EMAIL);
         String password = getIntent().getStringExtra(ControllerConstants.EXTRA_PASSWORD);
@@ -80,6 +80,7 @@ void next(final String email, final String password, final String provider) {
                 new OnCompleteListener<ProviderQueryResult>() {
             @Override
             public void onComplete(@NonNull Task<ProviderQueryResult> task) {
+                dismissDialog();
                 List<String> providers = task.getResult().getProviders();
                 if (providers.size() == 0) {
                     // new account for this email
@@ -116,6 +117,7 @@ public void onComplete(@NonNull Task<ProviderQueryResult> task) {
                                 WelcomeBackIDPPrompt.createIntent(
                                     getApplicationContext(),
                                     provider,
+                                    mProviderParcels,
                                     mAppName,
                                     email
                                 ),
@@ -129,11 +131,11 @@ public void onComplete(@NonNull Task<ProviderQueryResult> task) {
                             WelcomeBackIDPPrompt.createIntent(
                                 getApplicationContext(),
                                 provider,
+                                mProviderParcels,
                                 mAppName,
                                 email
                             ),
                             RC_WELCOME_BACK_IDP_PROMPT);
-                    finish();
                 }
             }
         });

auth/src/main/java/com/firebase/ui/auth/ui/NoControllerBaseActivity.java

@@ -41,6 +41,8 @@
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
 
+import java.util.ArrayList;
+
 public class WelcomeBackIDPPrompt extends NoControllerBaseActivity
         implements View.OnClickListener, IDPProvider.IDPCallback {
 
@@ -140,11 +142,13 @@ private String getEmailFromIntent() {
     public static Intent createIntent(
             Context context,
             String providerId,
+            ArrayList<IDPProviderParcel> providers,
             String appName,
             String email) {
         return new Intent().setClass(context, WelcomeBackIDPPrompt.class)
                 .putExtra(ControllerConstants.EXTRA_APP_NAME, appName)
                 .putExtra(ControllerConstants.EXTRA_PROVIDER, providerId)
+                .putExtra(ControllerConstants.EXTRA_PROVIDERS, providers)
                 .putExtra(ControllerConstants.EXTRA_EMAIL, email);
     }