Prep for final refactors (#1188)

Author: SUPERCILEX

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

@@ -0,0 +1,29 @@
+package com.firebase.ui.auth.data.model;
+
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.support.annotation.RestrictTo;
+
+import com.firebase.ui.auth.ErrorCodes;
+import com.firebase.ui.auth.FirebaseUiException;
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class IntentRequiredException extends FirebaseUiException {
+    private final Intent mIntent;
+    private final int mRequestCode;
+
+    public IntentRequiredException(@NonNull Intent intent, int requestCode) {
+        super(ErrorCodes.UNKNOWN_ERROR);
+        mIntent = intent;
+        mRequestCode = requestCode;
+    }
+
+    @NonNull
+    public Intent getIntent() {
+        return mIntent;
+    }
+
+    public int getRequestCode() {
+        return mRequestCode;
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.firebase.ui.auth.data.model;
+
+import android.app.PendingIntent;
+import android.support.annotation.NonNull;
+import android.support.annotation.RestrictTo;
+
+import com.firebase.ui.auth.ErrorCodes;
+import com.firebase.ui.auth.FirebaseUiException;
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class PendingIntentRequiredException extends FirebaseUiException {
+    private final PendingIntent mPendingIntent;
+    private final int mRequestCode;
+
+    public PendingIntentRequiredException(@NonNull PendingIntent pendingIntent, int requestCode) {
+        super(ErrorCodes.UNKNOWN_ERROR);
+        mPendingIntent = pendingIntent;
+        mRequestCode = requestCode;
+    }
+
+    @NonNull
+    public PendingIntent getPendingIntent() {
+        return mPendingIntent;
+    }
+
+    public int getRequestCode() {
+        return mRequestCode;
+    }
+}

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

@@ -17,6 +17,8 @@ public final class Resource<T> {
     private final T mValue;
     private final Exception mException;
 
+    private boolean mUsed;
+
     private Resource(State state, T value, Exception exception) {
         mState = state;
         mValue = value;
@@ -62,14 +64,20 @@ public State getState() {
 
     @Nullable
     public final Exception getException() {
+        mUsed = true;
         return mException;
     }
 
     @Nullable
     public T getValue() {
+        mUsed = true;
         return mValue;
     }
 
+    public boolean isUsed() {
+        return mUsed;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

auth/src/main/java/com/firebase/ui/auth/data/remote/ProfileMerger.java

@@ -7,7 +7,7 @@
 
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.User;
-import com.firebase.ui.auth.ui.TaskFailureLogger;
+import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;

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

@@ -4,7 +4,6 @@
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentSender;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -15,17 +14,15 @@
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
-import com.firebase.ui.auth.viewmodel.PendingResolution;
-import com.firebase.ui.auth.viewmodel.ResolutionCodes;
+import com.firebase.ui.auth.util.ui.FlowUtils;
 import com.firebase.ui.auth.viewmodel.smartlock.SmartLockHandler;
 import com.google.android.gms.auth.api.credentials.Credential;
 
 /**
  * Invisible Activity used for saving credentials to SmartLock.
  */
 public class CredentialSaveActivity extends HelperActivityBase {
-
-    private static final String TAG = "SmartlockSave";
+    private static final String TAG = "CredentialSaveActivity";
 
     private SmartLockHandler mHandler;
     private IdpResponse mIdpResponse;
@@ -50,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Credential credential = getIntent().getParcelableExtra(ExtraConstants.EXTRA_CREDENTIAL);
         mIdpResponse = getIntent().getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE);
 
-        mHandler.getSaveOperation().observe(this, new Observer<Resource<Void>>() {
+        mHandler.getOperation().observe(this, new Observer<Resource<Void>>() {
             @Override
             public void onChanged(@Nullable Resource<Void> resource) {
                 if (resource == null) {
@@ -62,20 +59,8 @@ public void onChanged(@Nullable Resource<Void> resource) {
             }
         });
 
-        mHandler.getPendingResolution().observe(this, new Observer<PendingResolution>() {
-            @Override
-            public void onChanged(@Nullable PendingResolution resolution) {
-                if (resolution == null) {
-                    Log.w(TAG, "getPendingResolution:onChanged: null");
-                    return;
-                }
-
-                onPendingResolution(resolution);
-            }
-        });
-
         // Avoid double-saving
-        Resource<Void> currentOp = mHandler.getSaveOperation().getValue();
+        Resource<Void> currentOp = mHandler.getOperation().getValue();
         if (currentOp == null) {
             Log.d(TAG, "Launching save operation.");
             mHandler.saveCredentials(credential);
@@ -86,10 +71,8 @@ public void onChanged(@Nullable PendingResolution resolution) {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // Forward activity results to the ViewModel
-        if (!mHandler.onActivityResult(requestCode, resultCode, data)) {
-            super.onActivityResult(requestCode, resultCode, data);
-        }
+        super.onActivityResult(requestCode, resultCode, data);
+        mHandler.onActivityResult(requestCode, resultCode);
     }
 
     private void onSaveOperation(@NonNull Resource<Void> resource) {
@@ -99,23 +82,11 @@ private void onSaveOperation(@NonNull Resource<Void> resource) {
                 break;
             case SUCCESS:
             case FAILURE:
-                finish(RESULT_OK, mIdpResponse.toIntent());
+                if (!resource.isUsed()
+                        && !FlowUtils.handleError(this, resource.getException())) {
+                    finish(RESULT_OK, mIdpResponse.toIntent());
+                }
                 break;
         }
     }
-
-    private void onPendingResolution(@NonNull PendingResolution resolution) {
-        if (resolution.getRequestCode() == ResolutionCodes.RC_CRED_SAVE) {
-            try {
-                startIntentSenderForResult(
-                        resolution.getPendingIntent().getIntentSender(),
-                        resolution.getRequestCode(),
-                        null, 0, 0, 0);
-            } catch (IntentSender.SendIntentException e) {
-                Log.e(TAG, "Failed to send resolution.", e);
-                finish(RESULT_OK, mIdpResponse.toIntent());
-            };
-        }
-    }
-
 }

auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java

@@ -64,7 +64,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mHandler = ViewModelProviders.of(this).get(RecoverPasswordHandler.class);
         mHandler.init(getFlowHolder().getArguments());
-        mHandler.getProgressLiveData().observe(this, new Observer<Resource<String>>() {
+        mHandler.getOperation().observe(this, new Observer<Resource<String>>() {
             @Override
             public void onChanged(Resource<String> resource) {
                 if (resource.getState() == State.LOADING) {

auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java

@@ -21,10 +21,10 @@
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.FragmentBase;
-import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.idp.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.ProviderUtils;
+import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.firebase.ui.auth.util.ui.ImeHelper;
 import com.firebase.ui.auth.util.ui.PreambleHandler;
 import com.firebase.ui.auth.util.ui.fieldvalidators.BaseValidator;

auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java

@@ -110,7 +110,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mHandler.init(getFlowHolder().getArguments());
 
         // Observe the state of the main auth operation
-        mHandler.getSignInOperation().observe(this, new Observer<Resource<IdpResponse>>() {
+        mHandler.getOperation().observe(this, new Observer<Resource<IdpResponse>>() {
             @Override
             public void onChanged(@Nullable Resource<IdpResponse> resource) {
                 onSignInOperation(resource);

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

@@ -41,10 +41,10 @@
 import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.EmailActivity;
 import com.firebase.ui.auth.ui.phone.PhoneActivity;
 import com.firebase.ui.auth.util.data.ProviderUtils;
+import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

@@ -39,9 +39,9 @@
 import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.ProviderUtils;
+import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;

auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java

@@ -33,7 +33,7 @@ public enum FirebaseAuthError {
 
     ERROR_CREDENTIAL_ALREADY_IN_USE("This credential is already associated with a different user account."),
 
-    ERROR_USER_DISABLED( "The user account has been disabled by an administrator."),
+    ERROR_USER_DISABLED("The user account has been disabled by an administrator."),
 
     ERROR_USER_TOKEN_EXPIRED("The user's credential has expired. The user must sign in again."),
 

auth/src/main/java/com/firebase/ui/auth/util/FirebaseAuthError.java

@@ -0,0 +1,21 @@
+package com.firebase.ui.auth.util.data;
+
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import com.google.android.gms.tasks.OnFailureListener;
+
+public class TaskFailureLogger implements OnFailureListener {
+    private String mTag;
+    private String mMessage;
+
+    public TaskFailureLogger(@NonNull String tag, @NonNull String message) {
+        mTag = tag;
+        mMessage = message;
+    }
+
+    @Override
+    public void onFailure(@NonNull Exception e) {
+        Log.w(mTag, mMessage, e);
+    }
+}

auth/src/main/java/com/firebase/ui/auth/util/data/TaskFailureLogger.java

@@ -37,10 +37,10 @@
 import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.FragmentBase;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.idp.CredentialSignInHandler;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.ProviderUtils;
+import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;

auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java

@@ -19,13 +19,13 @@
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.ui.FragmentBase;
-import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.EmailActivity;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
 import com.firebase.ui.auth.ui.phone.PhoneActivity;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.GoogleApiUtils;
 import com.firebase.ui.auth.util.data.ProviderUtils;
+import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.auth.api.credentials.CredentialRequest;
 import com.google.android.gms.auth.api.credentials.CredentialRequestResponse;

auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java

@@ -71,8 +71,8 @@ public BucketedTextChangeListener(EditText editText, int expectedContentLength,
     }
 
     /**
-     * For example, passing in ("-", 6) would return the following result: {"", "-", "--", "---",
-     * "----", "-----", "------"}
+     * For example, passing in ("-", 6) would return the following result:
+     * {"", "-", "--", "---", "----", "-----", "------"}
      *
      * @param repeatableChar the char to repeat to the specified length
      * @param length         the maximum length of repeated chars

auth/src/main/java/com/firebase/ui/auth/util/ui/BucketedTextChangeListener.java

@@ -0,0 +1,42 @@
+package com.firebase.ui.auth.util.ui;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.IntentSender;
+import android.support.annotation.NonNull;
+
+import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.data.model.IntentRequiredException;
+import com.firebase.ui.auth.data.model.PendingIntentRequiredException;
+import com.firebase.ui.auth.ui.HelperActivityBase;
+
+public final class FlowUtils {
+    private FlowUtils() {
+        throw new AssertionError("No instance for you!");
+    }
+
+    public static boolean handleError(@NonNull HelperActivityBase activity, @NonNull Exception e) {
+        if (e instanceof IntentRequiredException) {
+            IntentRequiredException typed = (IntentRequiredException) e;
+            activity.startActivityForResult(typed.getIntent(), typed.getRequestCode());
+            return true;
+        } else if (e instanceof PendingIntentRequiredException) {
+            PendingIntentRequiredException typed = (PendingIntentRequiredException) e;
+            startIntentSenderForResult(activity, typed.getPendingIntent(), typed.getRequestCode());
+            return true;
+        }
+
+        return false;
+    }
+
+    private static void startIntentSenderForResult(HelperActivityBase activity,
+                                                   PendingIntent intent,
+                                                   int requestCode) {
+        try {
+            activity.startIntentSenderForResult(
+                    intent.getIntentSender(), requestCode, null, 0, 0, 0);
+        } catch (IntentSender.SendIntentException e) {
+            activity.finish(Activity.RESULT_CANCELED, IdpResponse.getErrorIntent(e));
+        }
+    }
+}