Rewrite email logic with new architecture (#1214)

Author: samtstern

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

@@ -390,7 +390,7 @@ private static List<Credential> getCredentialsFromFirebaseUser(@NonNull Firebase
             String type = ProviderUtils.providerIdToAccountType(userInfo.getProviderId());
 
             credentials.add(new Credential.Builder(
-                    user.getEmail() == null ? user.getPhoneNumber() : user.getEmail())
+                    TextUtils.isEmpty(user.getEmail()) ? user.getPhoneNumber() : user.getEmail())
                     .setAccountType(type)
                     .build());
         }

auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java

@@ -14,7 +14,6 @@
 package com.firebase.ui.auth.data.model;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.DrawableRes;
@@ -84,13 +83,6 @@ public static FlowParameters fromIntent(Intent intent) {
         return intent.getParcelableExtra(ExtraConstants.FLOW_PARAMS);
     }
 
-    /**
-     * Extract FlowParameters from a Bundle.
-     */
-    public static FlowParameters fromBundle(Bundle bundle) {
-        return bundle.getParcelable(ExtraConstants.FLOW_PARAMS);
-    }
-
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(appName);

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

@@ -27,6 +27,6 @@ public class AppCompatBase extends HelperActivityBase {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTheme(R.style.FirebaseUI); // Provides default values
-        setTheme(getFlowHolder().getArguments().themeId);
+        setTheme(getFlowParams().themeId);
     }
 }

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

@@ -1,30 +1,31 @@
 package com.firebase.ui.auth.ui;
 
-import android.content.IntentSender;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.support.v4.app.Fragment;
 import android.view.ContextThemeWrapper;
 
+import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.FlowParameters;
-import com.firebase.ui.auth.util.AuthHelper;
+import com.google.firebase.auth.FirebaseUser;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class FragmentBase extends Fragment {
-
-    private FlowParameters mFlowParameters;
-    private AuthHelper mAuthHelper;
+    private HelperActivityBase mActivity;
     private ProgressDialogHolder mProgressDialogHolder;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mAuthHelper = new AuthHelper(getFlowParams());
-        ContextThemeWrapper context = new ContextThemeWrapper(
-                getContext(), getFlowParams().themeId);
-        mProgressDialogHolder = new ProgressDialogHolder(context);
+        if (!(getActivity() instanceof HelperActivityBase)) {
+            throw new IllegalStateException("Cannot use this fragment without the helper activity");
+        }
+        mActivity = (HelperActivityBase) getActivity();
+
+        mProgressDialogHolder = new ProgressDialogHolder(new ContextThemeWrapper(
+                getContext(), getFlowParams().themeId));
     }
 
     @Override
@@ -34,23 +35,13 @@ public void onDestroy() {
     }
 
     public FlowParameters getFlowParams() {
-        if (mFlowParameters == null) {
-            mFlowParameters = FlowParameters.fromBundle(getArguments());
-        }
-
-        return mFlowParameters;
-    }
-
-    public AuthHelper getAuthHelper() {
-        return mAuthHelper;
-    }
-
-    public ProgressDialogHolder getDialogHolder() {
-        return mProgressDialogHolder;
+        return mActivity.getFlowParams();
     }
 
-    public void startIntentSenderForResult(IntentSender sender, int requestCode)
-            throws IntentSender.SendIntentException {
-        startIntentSenderForResult(sender, requestCode, null, 0, 0, 0, null);
+    public void startSaveCredentials(
+            FirebaseUser firebaseUser,
+            IdpResponse response,
+            @Nullable String password) {
+        mActivity.startSaveCredentials(firebaseUser, response, password);
     }
 }

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

@@ -1,7 +1,6 @@
 package com.firebase.ui.auth.ui;
 
 import android.app.Activity;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -17,7 +16,6 @@
 import com.firebase.ui.auth.util.CredentialsUtil;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.ProviderUtils;
-import com.firebase.ui.auth.viewmodel.FlowHolder;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.firebase.auth.FirebaseUser;
@@ -27,9 +25,8 @@
 @SuppressWarnings("Registered")
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class HelperActivityBase extends AppCompatActivity {
-    private FlowHolder mFlowHolder;
+    private FlowParameters mParams;
 
-    private FlowParameters mFlowParameters;
     private AuthHelper mAuthHelper;
     private ProgressDialogHolder mProgressDialogHolder;
 
@@ -60,28 +57,17 @@ protected void onDestroy() {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-
-        // Forward the results of Smartlock Saving
+        // Forward the results of Smart Lock saving
         if (requestCode == RequestCodes.CRED_SAVE_FLOW) {
             finish(RESULT_OK, data);
         }
     }
 
-    public FlowHolder getFlowHolder() {
-        if (mFlowHolder == null) {
-            mFlowHolder = ViewModelProviders.of(this).get(FlowHolder.class);
-            mFlowHolder.init(FlowParameters.fromIntent(getIntent()));
-        }
-
-        return mFlowHolder;
-    }
-
     public FlowParameters getFlowParams() {
-        if (mFlowParameters == null) {
-            mFlowParameters = FlowParameters.fromIntent(getIntent());
+        if (mParams == null) {
+            mParams = FlowParameters.fromIntent(getIntent());
         }
-
-        return mFlowParameters;
+        return mParams;
     }
 
     public AuthHelper getAuthHelper() {
@@ -99,17 +85,16 @@ public void finish(int resultCode, @Nullable Intent intent) {
 
     public void startSaveCredentials(
             FirebaseUser firebaseUser,
-            @Nullable String password,
-            IdpResponse response) {
-
+            IdpResponse response,
+            @Nullable String password) {
         // Build credential
         String accountType = ProviderUtils.idpResponseToAccountType(response);
         Credential credential = CredentialsUtil.buildCredential(
                 firebaseUser, password, accountType);
 
         // Start the dedicated SmartLock Activity
-        Intent intent = CredentialSaveActivity.createIntent(this, getFlowParams(),
-                credential, response);
+        Intent intent = CredentialSaveActivity.createIntent(
+                this, getFlowParams(), credential, response);
         startActivityForResult(intent, RequestCodes.CRED_SAVE_FLOW);
     }
 }