[FOR PROGRESS, DO NOT MERGE] Rewrite FirebaseUI auth

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

@@ -0,0 +1,32 @@
+package com.firebase.ui.auth.data.model;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.RestrictTo;
+
+import com.firebase.ui.auth.ErrorCodes;
+import com.firebase.ui.auth.FirebaseUiException;
+
+/**
+ * Represents an error in which the phone number couldn't be automatically verified and must
+ * therefore be manually verified by the client by sending an SMS code.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class PhoneNumberVerificationRequiredException extends FirebaseUiException {
+    private final String mPhoneNumber;
+
+    /**
+     * @param number the phone number requiring verification, formatted with a country code prefix
+     */
+    public PhoneNumberVerificationRequiredException(@NonNull String number) {
+        super(ErrorCodes.PROVIDER_ERROR, "Phone number requires verification.");
+        mPhoneNumber = number;
+    }
+
+    /**
+     * @return the phone number requiring verification
+     */
+    @NonNull
+    public String getPhoneNumber() {
+        return mPhoneNumber;
+    }
+}

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

@@ -11,8 +11,8 @@
 import com.firebase.ui.auth.data.model.UserCancellationException;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.email.EmailActivity;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
-import com.firebase.ui.auth.viewmodel.idp.ProviderSignInBase;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class EmailSignInHandler extends ProviderSignInBase<Void> {

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

@@ -25,7 +25,7 @@
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
-import com.firebase.ui.auth.viewmodel.idp.ProviderSignInBase;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.google.firebase.auth.FacebookAuthProvider;
 
 import org.json.JSONException;

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

@@ -17,8 +17,8 @@
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
-import com.firebase.ui.auth.viewmodel.idp.ProviderSignInBase;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;

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

@@ -12,8 +12,8 @@
 import com.firebase.ui.auth.data.model.UserCancellationException;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.phone.PhoneActivity;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
-import com.firebase.ui.auth.viewmodel.idp.ProviderSignInBase;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class PhoneSignInHandler extends ProviderSignInBase<AuthUI.IdpConfig> {

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

@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.app.Application;
 import android.content.Intent;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
@@ -18,6 +19,7 @@
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
 import com.firebase.ui.auth.ui.idp.SingleSignInActivity;
 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.viewmodel.AuthViewModelBase;
@@ -127,6 +129,16 @@ private void redirectSignIn(String provider, String email) {
                         EmailActivity.createIntent(getApplication(), getArguments(), email),
                         RequestCodes.EMAIL_FLOW)));
                 break;
+            case PhoneAuthProvider.PROVIDER_ID:
+                Bundle args = new Bundle();
+                args.putString(ExtraConstants.PHONE, email);
+                setResult(Resource.<IdpResponse>forFailure(new IntentRequiredException(
+                        PhoneActivity.createIntent(
+                                getApplication(),
+                                getArguments(),
+                                args),
+                        RequestCodes.PHONE_FLOW)));
+                break;
             case GoogleAuthProvider.PROVIDER_ID:
             case FacebookAuthProvider.PROVIDER_ID:
             case TwitterAuthProvider.PROVIDER_ID:
@@ -146,7 +158,8 @@ private List<String> getCredentialAccountTypes() {
         List<String> accounts = new ArrayList<>();
         for (AuthUI.IdpConfig idpConfig : getArguments().providerInfo) {
             @AuthUI.SupportedProvider String providerId = idpConfig.getProviderId();
-            if (providerId.equals(GoogleAuthProvider.PROVIDER_ID)) {
+            if (providerId.equals(GoogleAuthProvider.PROVIDER_ID)
+                    || providerId.equals(PhoneAuthProvider.PROVIDER_ID)) {
                 accounts.add(ProviderUtils.providerIdToAccountType(providerId));
             }
         }

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

@@ -16,7 +16,7 @@
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.viewmodel.idp.ProviderSignInBase;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.google.firebase.auth.TwitterAuthProvider;
 import com.twitter.sdk.android.core.Callback;
 import com.twitter.sdk.android.core.Result;

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

@@ -12,7 +12,6 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.ui.credentials.CredentialSaveActivity;
-import com.firebase.ui.auth.util.AuthHelper;
 import com.firebase.ui.auth.util.CredentialUtils;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.ProviderUtils;
@@ -27,7 +26,6 @@
 public class HelperActivityBase extends AppCompatActivity {
     private FlowParameters mParams;
 
-    private AuthHelper mAuthHelper;
     private ProgressDialogHolder mProgressDialogHolder;
 
     protected static Intent createBaseIntent(
@@ -44,7 +42,6 @@ protected static Intent createBaseIntent(
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mAuthHelper = new AuthHelper(getFlowParams());
         mProgressDialogHolder = new ProgressDialogHolder(this);
     }
 
@@ -70,10 +67,6 @@ public FlowParameters getFlowParams() {
         return mParams;
     }
 
-    public AuthHelper getAuthHelper() {
-        return mAuthHelper;
-    }
-
     public ProgressDialogHolder getDialogHolder() {
         return mProgressDialogHolder;
     }

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

@@ -29,7 +29,7 @@
 import com.firebase.ui.auth.util.ui.fieldvalidators.PasswordFieldValidator;
 import com.firebase.ui.auth.util.ui.fieldvalidators.RequiredFieldValidator;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
-import com.firebase.ui.auth.viewmodel.idp.EmailProviderResponseHandler;
+import com.firebase.ui.auth.viewmodel.email.EmailProviderResponseHandler;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.FirebaseAuthWeakPasswordException;

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

@@ -42,8 +42,8 @@
 import com.firebase.ui.auth.data.remote.PhoneSignInHandler;
 import com.firebase.ui.auth.data.remote.TwitterSignInHandler;
 import com.firebase.ui.auth.ui.AppCompatBase;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
-import com.firebase.ui.auth.viewmodel.idp.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.idp.SocialProviderResponseHandler;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FacebookAuthProvider;

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

@@ -21,8 +21,8 @@
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.ProviderUtils;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
-import com.firebase.ui.auth.viewmodel.idp.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.idp.SocialProviderResponseHandler;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;

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

@@ -40,9 +40,9 @@
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.ProviderUtils;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.firebase.ui.auth.viewmodel.idp.LinkingSocialProviderResponseHandler;
-import com.firebase.ui.auth.viewmodel.idp.ProviderSignInBase;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;