Refactor chooseAccountActivity

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

@@ -29,8 +29,8 @@
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.RadioButton;
-
 import android.widget.TextView;
+
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.IdpResponse;
@@ -48,16 +48,9 @@
 import butterknife.OnClick;
 
 public class AuthUiActivity extends AppCompatActivity {
-
-    private static final String TAG = "AuthUIActivity";
-
     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 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 int RC_SIGN_IN = 100;
 
     @BindView(R.id.default_theme)
@@ -178,7 +171,6 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
         if (!isGoogleConfigured() || !isFacebookConfigured() || !isTwitterConfigured()) {
             showSnackbar(R.string.configuration_required);
         }
-
     }
 
     @OnClick(R.id.sign_in)
@@ -205,21 +197,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         showSnackbar(R.string.unknown_response);
     }
 
-
-    @MainThread
-    private void setGoogleScopesEnabled(boolean enabled) {
-        mGoogleScopesLabel.setEnabled(enabled);
-        mGoogleScopeDriveFile.setEnabled(enabled);
-        mGoogleScopeGames.setEnabled(enabled);
-    }
-
-    @MainThread
-    private void setFacebookScopesEnabled(boolean enabled) {
-        mFacebookScopesLabel.setEnabled(enabled);
-        mFacebookScopeFriends.setEnabled(enabled);
-        mFacebookScopePhotos.setEnabled(enabled);
-    }
-
     @MainThread
     private void handleSignInResponse(int resultCode, Intent data) {
         if (resultCode == RESULT_OK) {
@@ -241,6 +218,20 @@ private void handleSignInResponse(int resultCode, Intent data) {
         showSnackbar(R.string.unknown_sign_in_response);
     }
 
+    @MainThread
+    private void setGoogleScopesEnabled(boolean enabled) {
+        mGoogleScopesLabel.setEnabled(enabled);
+        mGoogleScopeDriveFile.setEnabled(enabled);
+        mGoogleScopeGames.setEnabled(enabled);
+    }
+
+    @MainThread
+    private void setFacebookScopesEnabled(boolean enabled) {
+        mFacebookScopesLabel.setEnabled(enabled);
+        mFacebookScopeFriends.setEnabled(enabled);
+        mFacebookScopePhotos.setEnabled(enabled);
+    }
+
     @MainThread
     @StyleRes
     private int getSelectedTheme() {

auth/src/main/AndroidManifest.xml

@@ -16,10 +16,10 @@
             android:value="@string/twitter_consumer_secret"/>
 
         <activity
-            android:name="com.firebase.ui.auth.ui.email.ConfirmRecoverPasswordActivity"
-            android:label="@string/title_confirm_recover_password_activity"
+            android:name=".ui.KickoffActivity"
+            android:label="@string/default_toolbar_title"
             android:exported="false"
-            android:theme="@style/FirebaseUI.Dialog"/>
+            android:theme="@style/FirebaseUI.Translucent"/>
 
         <activity
             android:name=".ui.email.EmailHintContainerActivity"
@@ -69,18 +69,6 @@
             android:exported="false"
             android:theme="@style/FirebaseUI"/>
 
-        <activity
-            android:name=".ui.idp.IdpSignInContainerActivity"
-            android:label="@string/default_toolbar_title"
-            android:exported="false"
-            android:theme="@style/FirebaseUI.Translucent"/>
-
-        <activity
-            android:name=".ui.ChooseAccountActivity"
-            android:label="@string/default_toolbar_title"
-            android:exported="false"
-            android:theme="@style/FirebaseUI.Translucent"/>
-
         <activity
             android:name="com.facebook.FacebookActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"

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

@@ -15,25 +15,24 @@
 package com.firebase.ui.auth;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.RestrictTo;
 import android.support.annotation.StyleRes;
-import android.support.annotation.VisibleForTesting;
 
 import com.facebook.FacebookSdk;
 import com.facebook.login.LoginManager;
-import com.firebase.ui.auth.ui.ChooseAccountActivity;
 import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.ui.KickoffActivity;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
 import com.firebase.ui.auth.util.CredentialsApiHelper;
 import com.firebase.ui.auth.util.GoogleApiClientTaskHelper;
 import com.firebase.ui.auth.util.Preconditions;
-import com.firebase.ui.auth.util.SmartLockUtil;
+import com.firebase.ui.auth.util.smartlock.SmartLock;
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
@@ -346,7 +345,7 @@ public Task<Void> delete(@NonNull Activity activity) {
         CredentialsApiHelper credentialHelper = CredentialsApiHelper.getInstance(gacHelper);
 
         // Get all SmartLock credentials associated with the user
-        List<Credential> credentials = SmartLockUtil.credentialsFromFirebaseUser(firebaseUser);
+        List<Credential> credentials = SmartLock.credentialsFromFirebaseUser(firebaseUser);
 
         // For each Credential in the list, create a task to delete it.
         List<Task<?>> credentialTasks = new ArrayList<>();
@@ -571,7 +570,8 @@ public SignInIntentBuilder setProviders(@NonNull List<IdpConfig> idpConfigs) {
             for (IdpConfig idpConfig : idpConfigs) {
                 if (configuredProviders.contains(idpConfig.getProviderId())) {
                     throw new IllegalArgumentException("Each provider can only be set once. "
-                                                               + idpConfig.getProviderId() + " was set twice.");
+                                                               + idpConfig.getProviderId()
+                                                               + " was set twice.");
                 }
                 configuredProviders.add(idpConfig.getProviderId());
                 mProviders.add(idpConfig);
@@ -613,24 +613,6 @@ public SignInIntentBuilder setIsSmartLockEnabled(boolean enabled) {
             return this;
         }
 
-        public Intent build() {
-            Context context = mApp.getApplicationContext();
-            return build(context);
-        }
-
-        @VisibleForTesting
-        public Intent build(Context context) {
-            return ChooseAccountActivity.createIntent(
-                    context,
-                    new FlowParameters(
-                            mApp.getName(),
-                            new ArrayList<>(mProviders),
-                            mTheme,
-                            mLogo,
-                            mTosUrl,
-                            mIsSmartLockEnabled));
-        }
-
         private boolean isIdpAlreadyConfigured(@NonNull String providerId) {
             for (IdpConfig config : mProviders) {
                 if (config.getProviderId().equals(providerId)) {
@@ -639,5 +621,19 @@ private boolean isIdpAlreadyConfigured(@NonNull String providerId) {
             }
             return false;
         }
+
+        public Intent build() {
+            return KickoffActivity.createIntent(mApp.getApplicationContext(), getFlowParams());
+        }
+
+        @RestrictTo(RestrictTo.Scope.TESTS)
+        public FlowParameters getFlowParams() {
+            return new FlowParameters(mApp.getName(),
+                                      new ArrayList<>(mProviders),
+                                      mTheme,
+                                      mLogo,
+                                      mTosUrl,
+                                      mIsSmartLockEnabled);
+        }
     }
 }

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

@@ -0,0 +1,35 @@
+package com.firebase.ui.auth;
+
+import android.content.Intent;
+import android.content.IntentSender;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+
+import com.firebase.ui.auth.ui.ExtraConstants;
+import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.util.BaseHelper;
+
+public class FragmentHelper extends BaseHelper {
+    private Fragment mFragment;
+
+    public FragmentHelper(Fragment fragment) {
+        super(fragment.getContext(), (FlowParameters) fragment.getArguments()
+                .getParcelable(ExtraConstants.EXTRA_FLOW_PARAMS));
+        mFragment = fragment;
+    }
+
+    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;
+    }
+
+    public void startIntentSenderForResult(IntentSender sender, int requestCode)
+            throws IntentSender.SendIntentException {
+        mFragment.startIntentSenderForResult(sender, requestCode, null, 0, 0, 0, null);
+    }
+}