Refactor the AuthMethodPicker and IDPSignInContainer to not use a controller and clean up some of the activity finishing code.

Change-Id: I2678417a214890b0320fd5dfa330b7dd3c4b5b08

Author: Aaron Mandle

auth/src/main/java/com/firebase/ui/auth/choreographer/idp/IDPController.java

@@ -19,9 +19,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
 
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;

auth/src/main/java/com/firebase/ui/auth/choreographer/idp/provider/FacebookProvider.java

@@ -20,8 +20,6 @@
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.Button;
 
 import com.firebase.ui.auth.R;
 import com.google.android.gms.auth.api.Auth;
@@ -30,7 +28,6 @@
 import com.google.android.gms.auth.api.signin.GoogleSignInResult;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.firebase.auth.AuthCredential;
-import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
 
 public class GoogleProvider implements IDPProvider, OnClickListener {

auth/src/main/java/com/firebase/ui/auth/choreographer/idp/provider/GoogleProvider.java

@@ -18,8 +18,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
 
 public interface IDPProvider {
 

auth/src/main/java/com/firebase/ui/auth/choreographer/idp/provider/IDPProvider.java

@@ -30,10 +30,18 @@
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.ProviderQueryResult;
 
+import java.util.Arrays;
 import java.util.List;
 
 public class AccountLinkInitActivity extends NoControllerBaseActivity {
-    FirebaseAuthWrapper mApiWrapper;
+    protected FirebaseAuthWrapper mApiWrapper;
+    private static final int RC_SAVE_CREDENTIALS = 3;
+    private static final int RC_WELCOME_BACK_IDP_PROMPT = 4;
+    private static final int RC_WELCOME_BACK_PASSWORD_PROMPT = 5;
+    private static final List<Integer> REQUEST_CODES = Arrays.asList(
+            RC_SAVE_CREDENTIALS,
+            RC_WELCOME_BACK_IDP_PROMPT,
+            RC_WELCOME_BACK_PASSWORD_PROMPT);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -54,9 +62,15 @@ public static Intent createStartIntent(Context context, String appName, String i
                 .putExtra(ControllerConstants.EXTRA_PROVIDER, provider);
     }
 
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (REQUEST_CODES.contains(requestCode)) {
+            finish(resultCode, data);
+        }
+    }
+
     void next(final String email, final String password, final String provider) {
         if (email == null) {
-            finish();
+            finish(RESULT_OK, new Intent());
             return;
         }
         FirebaseAuth firebaseAuth = getFirebaseAuth();
@@ -69,44 +83,56 @@ public void onComplete(@NonNull Task<ProviderQueryResult> task) {
                 List<String> providers = task.getResult().getProviders();
                 if (providers.size() == 0) {
                     // new account for this email
-                    startActivity(SaveCredentialsActivity.createIntent(
+                    startActivityForResult(SaveCredentialsActivity.createIntent(
                             getApplicationContext(),
                             null,
                             email,
                             password,
                             provider,
                             null,
-                            mAppName));
-                    finish();
+                            mAppName), RC_SAVE_CREDENTIALS);
                 } else if (providers.size() == 1) {
                     if (providers.get(0).equals(provider)) {
                         // existing account but has this IDP linked
-                        startActivity(
-                            new Intent(getApplicationContext(), SaveCredentialsActivity.class)
-                                .putExtra(ControllerConstants.EXTRA_EMAIL, email)
-                                .putExtra(ControllerConstants.EXTRA_PROVIDER, provider)
-                                .putExtra(ControllerConstants.EXTRA_PASSWORD, password));
-                        finish();
+                        startActivityForResult(
+                            SaveCredentialsActivity.createIntent(
+                                    AccountLinkInitActivity.this,
+                                    null,
+                                    email,
+                                    password,
+                                    provider,
+                                    null,
+                                    mAppName),
+                            RC_SAVE_CREDENTIALS);
                     } else {
                         if (providers.get(0).equals(EmailAuthProvider.PROVIDER_ID)) {
-                            startActivity(
-                                new Intent(getApplicationContext(), WelcomeBackPasswordPrompt.class)
-                                    .putExtra(ControllerConstants.EXTRA_EMAIL, email)
-                                    .putExtra(ControllerConstants.EXTRA_APP_NAME, mAppName));
-                            finish();
+                            startActivityForResult(
+                                WelcomeBackPasswordPrompt.createIntent(
+                                    getApplicationContext(), email, mAppName),
+                                RC_WELCOME_BACK_PASSWORD_PROMPT);
                         } else {
                             // existing account but has a different IDP linked
-                            startActivity(
-                                new Intent(getApplicationContext(), WelcomeBackIDPPrompt.class)
-                                    .putExtra(ControllerConstants.EXTRA_EMAIL, email)
-                                    .putExtra(ControllerConstants.EXTRA_PROVIDER, provider)
+                            startActivityForResult(
+                                WelcomeBackIDPPrompt.createIntent(
+                                    getApplicationContext(),
+                                    provider,
+                                    mAppName,
+                                    email
+                                ),
+                                RC_WELCOME_BACK_IDP_PROMPT
                             );
                         }
                     }
                 } else {
                     // more than one providers
-                    startActivity(new Intent(getApplicationContext(), WelcomeBackIDPPrompt.class)
-                            .putExtra(ControllerConstants.EXTRA_EMAIL, email));
+                    startActivityForResult(
+                            WelcomeBackIDPPrompt.createIntent(
+                                getApplicationContext(),
+                                provider,
+                                mAppName,
+                                email
+                            ),
+                            RC_WELCOME_BACK_IDP_PROMPT);
                     finish();
                 }
             }

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

@@ -14,6 +14,7 @@
 
 package com.firebase.ui.auth.ui.account_link;
 
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Bundle;
@@ -72,6 +73,12 @@ protected void onCreate(Bundle savedInstanceState) {
         troubleSigningIn.setOnClickListener(this);
     }
 
+    public static Intent createIntent(Context context, String email, String appName) {
+        return new Intent(context, WelcomeBackPasswordPrompt.class)
+                .putExtra(ControllerConstants.EXTRA_EMAIL, email)
+                .putExtra(ControllerConstants.EXTRA_APP_NAME, appName);
+    }
+
     @Override
     public void onClick(View view) {
         int id = view.getId();