Complete rewrite/refactor of email sign in flow (#418)

Author: SUPERCILEX

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -50,7 +50,7 @@
 public class AuthUiActivity extends AppCompatActivity {
     private static final String UNCHANGED_CONFIG_VALUE = "CHANGE-ME";
     private static final String GOOGLE_TOS_URL = "https://www.google.com/policies/terms/";
-    private static final String FIREBASE_TOS_URL = "https://www.firebase.com/terms/terms-of-service.html";
+    private static final String FIREBASE_TOS_URL = "https://firebase.google.com/terms/";
     private static final int RC_SIGN_IN = 100;
 
     @BindView(R.id.default_theme)

auth/build.gradle

@@ -38,6 +38,8 @@ android {
 
 dependencies {
     compile "com.android.support:design:$support_library_version"
+    compile "com.android.support:customtabs:$support_library_version"
+
     compile "com.google.firebase:firebase-auth:$firebase_version"
     compile "com.google.android.gms:play-services-auth:$firebase_version"
 
@@ -46,7 +48,6 @@ dependencies {
 
     // The following libraries are needed to prevent incompatibilities with the facebook
     // library when updating com.android.support libraries:
-    compile "com.android.support:customtabs:$support_library_version"
     compile "com.android.support:cardview-v7:$support_library_version"
 
 

auth/src/main/AndroidManifest.xml

@@ -25,12 +25,6 @@
             android:exported="false"
             android:theme="@style/Theme.AppCompat.NoActionBar"/>
 
-        <activity
-            android:name=".ui.email.EmailHintContainerActivity"
-            android:label="@string/default_toolbar_title"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.NoActionBar"/>
-
         <activity
             android:name=".ui.email.RecoverPasswordActivity"
             android:label="@string/title_recover_password_activity"
@@ -43,12 +37,6 @@
             android:exported="false"
             android:theme="@style/FirebaseUI"/>
 
-        <activity
-            android:name=".ui.email.SignInNoPasswordActivity"
-            android:label="@string/title_sign_in_no_password_activity"
-            android:exported="false"
-            android:theme="@style/FirebaseUI"/>
-
         <activity
             android:name=".ui.email.SignInActivity"
             android:label="@string/title_sign_in_activity"

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

@@ -29,6 +29,10 @@ public ActivityHelper(AppCompatBase activity, Intent intent) {
         mActivity = activity;
     }
 
+    public void configureTheme() {
+        mActivity.setTheme(getFlowParams().themeId);
+    }
+
     public void startActivityForResult(Intent intent, int requestCode) {
         mActivity.startActivityForResult(intent, requestCode);
     }

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

@@ -22,18 +22,14 @@
 
 public class BaseHelper {
     protected Context mContext;
+    protected ProgressDialog mProgressDialog;
     private final FlowParameters mFlowParams;
-    private ProgressDialog mProgressDialog;
 
     public BaseHelper(Context context, FlowParameters parameters) {
         mContext = context;
         mFlowParams = parameters;
     }
 
-    public void configureTheme() {
-        mContext.setTheme(mFlowParams.themeId);
-    }
-
     public FlowParameters getFlowParams() {
         return mFlowParams;
     }

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

@@ -1,5 +1,6 @@
 package com.firebase.ui.auth.ui;
 
+import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.os.Bundle;
@@ -9,7 +10,7 @@ public class FragmentHelper extends BaseHelper {
     private Fragment mFragment;
 
     public FragmentHelper(Fragment fragment) {
-        super(fragment.getContext(), (FlowParameters) fragment.getArguments()
+        super(fragment.getContext().getApplicationContext(), (FlowParameters) fragment.getArguments()
                 .getParcelable(ExtraConstants.EXTRA_FLOW_PARAMS));
         mFragment = fragment;
     }
@@ -18,14 +19,20 @@ public void finish(int resultCode, Intent intent) {
         finishActivity(mFragment.getActivity(), resultCode, intent);
     }
 
-    public static Bundle getFlowParamsBundle(FlowParameters params) {
-        Bundle bundle = new Bundle();
-        bundle.putParcelable(ExtraConstants.EXTRA_FLOW_PARAMS, params);
-        return bundle;
+    @Override
+    public void showLoadingDialog(String message) {
+        dismissDialog();
+        mProgressDialog = ProgressDialog.show(mFragment.getContext(), "", message, true);
     }
 
     public void startIntentSenderForResult(IntentSender sender, int requestCode)
             throws IntentSender.SendIntentException {
         mFragment.startIntentSenderForResult(sender, requestCode, null, 0, 0, 0, null);
     }
+
+    public static Bundle getFlowParamsBundle(FlowParameters params) {
+        Bundle bundle = new Bundle();
+        bundle.putParcelable(ExtraConstants.EXTRA_FLOW_PARAMS, params);
+        return bundle;
+    }
 }

auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java

@@ -146,7 +146,7 @@ public void onSuccess(AuthResult authResult) {
                                         });
                     }
                 })
-                .addOnFailureListener(new OnFailureListener() {
+                .addOnFailureListener(this, new OnFailureListener() {
                     @Override
                     public void onFailure(@NonNull Exception e) {
                         mActivityHelper.dismissDialog();