[#1916] Use Intent as input type for FirebaseAuthUIActivityResultContract

Author: jossiwolf

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

@@ -1,5 +1,6 @@
 package com.firebase.uidemo.auth;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -9,8 +10,8 @@
 
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.ErrorCodes;
-import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.FirebaseAuthUIActivityResultContract;
+import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.util.ConfigurationUtils;
@@ -37,8 +38,6 @@ public class AnonymousUpgradeActivity extends AppCompatActivity
 
     private static final String TAG = "AccountLink";
 
-    private static final int RC_SIGN_IN = 123;
-
     @BindView(R.id.status_text)
     TextView mStatus;
 
@@ -56,7 +55,7 @@ public class AnonymousUpgradeActivity extends AppCompatActivity
 
     private AuthCredential mPendingCredential;
 
-    private final ActivityResultLauncher<AuthUI.SignInIntentBuilder> signIn =
+    private final ActivityResultLauncher<Intent> signIn =
             registerForActivityResult(new FirebaseAuthUIActivityResultContract(), this);
 
     @Override
@@ -96,11 +95,12 @@ public void onComplete(@NonNull Task<AuthResult> task) {
     @OnClick(R.id.begin_flow)
     public void startAuthUI() {
         List<AuthUI.IdpConfig> providers = ConfigurationUtils.getConfiguredProviders(this);
-        AuthUI.SignInIntentBuilder intentBuilder = AuthUI.getInstance().createSignInIntentBuilder()
+        Intent signInIntent = AuthUI.getInstance().createSignInIntentBuilder()
                 .setLogo(R.drawable.firebase_auth_120dp)
                 .setAvailableProviders(providers)
-                .enableAnonymousUsersAutoUpgrade();
-        signIn.launch(intentBuilder);
+                .enableAnonymousUsersAutoUpgrade()
+                .build();
+        signIn.launch(signInIntent);
     }
 
     @OnClick(R.id.resolve_merge)

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

@@ -71,8 +71,6 @@ public class AuthUiActivity extends AppCompatActivity
     private static final String FIREBASE_PRIVACY_POLICY_URL = "https://firebase.google" +
             ".com/terms/analytics/#7_privacy";
 
-    private static final int RC_SIGN_IN = 100;
-
     @BindView(R.id.root) View mRootView;
 
     @BindView(R.id.google_provider) CheckBox mUseGoogleProvider;
@@ -116,7 +114,7 @@ public class AuthUiActivity extends AppCompatActivity
     @BindView(R.id.require_name) CheckBox mRequireName;
     @BindView(R.id.use_auth_emulator) CheckBox mUseEmulator;
 
-    private final ActivityResultLauncher<AuthUI.SignInIntentBuilder> signIn =
+    private final ActivityResultLauncher<Intent> signIn =
             registerForActivityResult(new FirebaseAuthUIActivityResultContract(), this);
 
     @NonNull
@@ -245,11 +243,11 @@ public void flipEmailLinkProviderCheckbox(boolean passwordProviderIsChecked) {
 
     @OnClick(R.id.sign_in)
     public void signIn() {
-        signIn.launch(getSignInIntentBuilder(/*link=*/null));
+        signIn.launch(getSignInIntent(/*link=*/null));
     }
 
     public void signInWithEmailLink(@Nullable String link) {
-        signIn.launch(getSignInIntentBuilder(link));
+        signIn.launch(getSignInIntent(link));
     }
 
     @NonNull
@@ -262,7 +260,7 @@ public AuthUI getAuthUI() {
         return authUI;
     }
 
-    private AuthUI.SignInIntentBuilder getSignInIntentBuilder(@Nullable String link) {
+    private Intent getSignInIntent(@Nullable String link) {
         AuthUI.SignInIntentBuilder builder = getAuthUI().createSignInIntentBuilder()
                 .setTheme(getSelectedTheme())
                 .setLogo(getSelectedLogo())
@@ -297,7 +295,7 @@ private AuthUI.SignInIntentBuilder getSignInIntentBuilder(@Nullable String link)
         if (auth.getCurrentUser() != null && auth.getCurrentUser().isAnonymous()) {
             builder.enableAnonymousUsersAutoUpgrade();
         }
-        return builder;
+        return builder.build();
     }
 
     @OnClick(R.id.sign_in_silent)

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

@@ -10,17 +10,19 @@
 import androidx.annotation.Nullable;
 
 /**
- * A {@link ActivityResultContract} describing that the caller can launch authentication with a
- * {@link com.firebase.ui.auth.AuthUI.SignInIntentBuilder} and is guaranteed to receive a
- * {@link FirebaseAuthUIAuthenticationResult} as result.
+ * A {@link ActivityResultContract} describing that the caller can launch authentication flow with a
+ * {@link Intent} and is guaranteed to receive a {@link FirebaseAuthUIAuthenticationResult} as
+ * result. The given input intent <b>must</b> be created using a
+ * {@link com.firebase.ui.auth.AuthUI.SignInIntentBuilder} in order to guarantee a successful
+ * launch of the authentication flow.
  */
 public class FirebaseAuthUIActivityResultContract extends
-        ActivityResultContract<AuthUI.SignInIntentBuilder, FirebaseAuthUIAuthenticationResult> {
+        ActivityResultContract<Intent, FirebaseAuthUIAuthenticationResult> {
 
     @NonNull
     @Override
-    public Intent createIntent(@NonNull Context context, AuthUI.SignInIntentBuilder input) {
-        return input.build();
+    public Intent createIntent(@NonNull Context context, Intent input) {
+        return input;
     }
 
     @Override