Refactor container activities

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;
@@ -47,18 +47,10 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-public class AuthUiActivity extends AppCompatActivity {
-
-    private static final String TAG = "AuthUIActivity";
-
+public class AuthUiActivity extends AppCompatActivity implements AuthUI.SignInResult {
     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 int RC_SIGN_IN = 100;
+    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";
 
     @BindView(R.id.default_theme)
     RadioButton mUseDefaultTheme;
@@ -183,26 +175,13 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
 
     @OnClick(R.id.sign_in)
     public void signIn(View view) {
-        startActivityForResult(
-                AuthUI.getInstance().createSignInIntentBuilder()
-                        .setTheme(getSelectedTheme())
-                        .setLogo(getSelectedLogo())
-                        .setProviders(getSelectedProviders())
-                        .setTosUrl(getSelectedTosUrl())
-                        .setIsSmartLockEnabled(mEnableSmartLock.isChecked())
-                        .build(),
-                RC_SIGN_IN);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == RC_SIGN_IN) {
-            handleSignInResponse(resultCode, data);
-            return;
-        }
-
-        showSnackbar(R.string.unknown_response);
+        AuthUI.getInstance().createSignInIntentBuilder()
+                .setTheme(getSelectedTheme())
+                .setLogo(getSelectedLogo())
+                .setProviders(getSelectedProviders())
+                .setTosUrl(getSelectedTosUrl())
+                .setIsSmartLockEnabled(mEnableSmartLock.isChecked())
+                .build(this);
     }
 
 
@@ -221,13 +200,14 @@ private void setFacebookScopesEnabled(boolean enabled) {
     }
 
     @MainThread
-    private void handleSignInResponse(int resultCode, Intent data) {
-        if (resultCode == RESULT_OK) {
-            startActivity(SignedInActivity.createIntent(this, IdpResponse.fromResultIntent(data)));
-            finish();
-            return;
-        }
+    @Override
+    public void onSignInSuccessful(Intent data) {
+        startActivity(SignedInActivity.createIntent(this, IdpResponse.fromResultIntent(data)));
+        finish();
+    }
 
+    @Override
+    public void onSignInFailed(int resultCode) {
         if (resultCode == RESULT_CANCELED) {
             showSnackbar(R.string.sign_in_cancelled);
             return;

app/src/main/res/values/strings.xml

@@ -32,8 +32,6 @@
     <string name="google_tos_label">Google TOS</string>
     <string name="firebase_tos_label">Firebase TOS</string>
     <string name="tos_header">Terms of Service URL:</string>
-    <string name="unknown_response">Unexpected onActivityResult response code</string>
-    <string name="ok_label">OK</string>
     <string name="unknown_sign_in_response">Unknown response from AuthUI sign-in</string>
     <string name="sign_in_cancelled">Sign in cancelled</string>
     <string name="no_internet_connection">No internet connection</string>

auth/build.gradle

@@ -37,9 +37,9 @@ dependencies {
     // See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
     testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
 
-    compile 'com.facebook.android:facebook-android-sdk:4.14.1'
-    compile("com.twitter.sdk.android:twitter:2.0.0@aar") {
-        transitive = true;
+    compile 'com.facebook.android:facebook-android-sdk:4.16.1'
+    compile("com.twitter.sdk.android:twitter:2.1.1@aar") {
+        transitive = true
     }
     compile "com.android.support:design:${project.ext.support_library_version}"
 

auth/src/main/AndroidManifest.xml

@@ -14,10 +14,6 @@
             android:name="com.firebase.ui.auth.ui.email.ConfirmRecoverPasswordActivity"
             android:label="@string/title_confirm_recover_password_activity"
             android:theme="@style/FirebaseUI.Dialog" />
-        <activity
-            android:name="com.firebase.ui.auth.ui.email.EmailHintContainerActivity"
-            android:label="@string/default_toolbar_title"
-            android:theme="@style/FirebaseUI.Translucent" />
         <activity
             android:name="com.firebase.ui.auth.ui.email.RecoverPasswordActivity"
             android:label="@string/title_recover_password_activity"
@@ -49,17 +45,12 @@
         <activity
             android:name="com.firebase.ui.auth.ui.idp.IdpSignInContainerActivity"
             android:label="@string/default_toolbar_title"
-            android:theme="@style/FirebaseUI.Translucent" />
-        <activity
-            android:name=".ui.ChooseAccountActivity"
-            android:label="@string/default_toolbar_title"
-            android:theme="@style/FirebaseUI.Translucent" />
-
+            android:theme="@style/FirebaseUI.FacebookTranslucent" />
         <activity
             android:name="com.facebook.FacebookActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:label="@string/app_name"
-            android:theme="@style/FirebaseUI.Translucent"
+            android:theme="@style/FirebaseUI.FacebookTranslucent"
             tools:replace="android:theme" />
 
         <activity

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

@@ -15,24 +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.StyleRes;
-import android.support.annotation.VisibleForTesting;
+import android.support.v4.app.FragmentActivity;
+
 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.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.SignInDelegate;
+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;
@@ -48,6 +48,7 @@
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -226,6 +227,11 @@
  * </ul>
  */
 public class AuthUI {
+    public interface SignInResult {
+        void onSignInSuccessful(Intent data);
+
+        void onSignInFailed(int resultCode);
+    }
 
     /**
      * Provider identifier for email and password credentials, for use with
@@ -325,6 +331,7 @@ public Void then(@NonNull Task<GoogleApiClient> task) throws Exception {
      * API. Returns a {@code Task} that succeeds if the Firebase Auth user deletion succeeds and
      * fails if the Firebase Auth deletion fails. Credentials deletion failures are handled
      * silently.
+     *
      * @param activity the calling {@link Activity}.
      */
     public Task<Void> delete(@NonNull Activity activity) {
@@ -343,7 +350,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<>();
@@ -381,6 +388,7 @@ public SignInIntentBuilder createSignInIntentBuilder() {
     /**
      * Retrieves the {@link AuthUI} instance associated with the default app, as returned by
      * {@code FirebaseApp.getInstance()}.
+     *
      * @throws IllegalStateException if the default app is not initialized.
      */
     public static AuthUI getInstance() {
@@ -406,7 +414,8 @@ public static AuthUI getInstance(FirebaseApp app) {
      * Default theme used by {@link SignInIntentBuilder#setTheme(int)} if no theme
      * customization is required.
      */
-    public static @StyleRes int getDefaultTheme() {
+    @StyleRes
+    public static int getDefaultTheme() {
         // TODO(iainmgin): figure out why this works as a static method but not as a static
         //                 final variable.
         return R.style.FirebaseUI;
@@ -471,6 +480,7 @@ public static class Builder {
 
             /**
              * Builds the configuration parameters for an identity provider.
+             *
              * @param providerId An ID of one of the supported identity providers. e.g.
              * {@link AuthUI#GOOGLE_PROVIDER}. See {@link AuthUI#SUPPORTED_PROVIDERS} for the
              * complete list of supported Identity providers
@@ -568,7 +578,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);
@@ -602,32 +613,14 @@ public SignInIntentBuilder setProviders(@NonNull String... providers) {
 
         /**
          * Enables or disables the use of Smart Lock for Passwords in the sign in flow.
-         * 
+         *
          * <p>SmartLock is enabled by default
          */
         public SignInIntentBuilder setIsSmartLockEnabled(boolean enabled) {
             mIsSmartLockEnabled = 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)) {
@@ -636,5 +629,18 @@ private boolean isIdpAlreadyConfigured(@NonNull String providerId) {
             }
             return false;
         }
+
+        public void build(@NonNull FragmentActivity activity) {
+            SignInDelegate.delegateSignIn(activity, getFlowParams());
+        }
+
+        public FlowParameters getFlowParams() {
+            return new FlowParameters(mApp.getName(),
+                                      new ArrayList<>(mProviders),
+                                      mTheme,
+                                      mLogo,
+                                      mTosUrl,
+                                      mIsSmartLockEnabled);
+        }
     }
 }

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

@@ -18,7 +18,15 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.Nullable;
+
+import com.firebase.ui.auth.provider.FacebookProvider;
+import com.firebase.ui.auth.provider.GoogleProvider;
+import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.ExtraConstants;
+import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.FacebookAuthProvider;
+import com.google.firebase.auth.GoogleAuthProvider;
+import com.google.firebase.auth.TwitterAuthProvider;
 
 /**
  * A container that encapsulates the result of authenticating with an Identity Provider.
@@ -120,4 +128,18 @@ public void writeToParcel(Parcel dest, int flags) {
     public static IdpResponse fromResultIntent(Intent resultIntent) {
         return resultIntent.getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE);
     }
+
+    public static AuthCredential createCredential(IdpResponse idpSignInResponse) {
+        if (idpSignInResponse.getProviderType().equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)) {
+            return FacebookProvider.createAuthCredential(idpSignInResponse);
+        } else if (idpSignInResponse.getProviderType().equalsIgnoreCase(GoogleAuthProvider
+                                                                                .PROVIDER_ID)) {
+            return GoogleProvider.createAuthCredential(idpSignInResponse);
+        } else if (idpSignInResponse
+                .getProviderType()
+                .equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)) {
+            return TwitterProvider.createAuthCredential(idpSignInResponse);
+        }
+        return null;
+    }
 }

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

@@ -19,6 +19,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
+
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
@@ -34,11 +35,13 @@
 import com.firebase.ui.auth.R;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.FacebookAuthProvider;
-import java.util.ArrayList;
-import java.util.List;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FacebookProvider implements IdpProvider, FacebookCallback<LoginResult> {
     protected static final String ERROR = "err";
     protected static final String ERROR_MSG = "err_msg";