Version 4.3.0

Version 4.3.0

Author: samtstern

README.md

@@ -50,19 +50,19 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    implementation 'com.firebaseui:firebase-ui-database:4.2.1'
+    implementation 'com.firebaseui:firebase-ui-database:4.3.0'
 
     // FirebaseUI for Cloud Firestore
-    implementation 'com.firebaseui:firebase-ui-firestore:4.2.1'
+    implementation 'com.firebaseui:firebase-ui-firestore:4.3.0'
 
     // FirebaseUI for Firebase Auth
-    implementation 'com.firebaseui:firebase-ui-auth:4.2.1'
+    implementation 'com.firebaseui:firebase-ui-auth:4.3.0'
 
     // FirebaseUI for Firebase Auth (GitHub provider)
-    implementation 'com.firebaseui:firebase-ui-auth-github:4.2.1'
+    implementation 'com.firebaseui:firebase-ui-auth-github:4.3.0'
 
     // FirebaseUI for Cloud Storage
-    implementation 'com.firebaseui:firebase-ui-storage:4.2.1'
+    implementation 'com.firebaseui:firebase-ui-storage:4.3.0'
 }
 ```
 
@@ -100,20 +100,8 @@ firebase-ui-storage
 |--- com.google.firebase:firebase-storage
 ```
 
-As of version `15.0.0`, Firebase and Google Play services libraries have independent, semantic
-versions. This means that FirebaseUI has independent dependencies on each of the libraries above.
-For best results, your app should depend on a version of each dependency with the same major
-version number as the version used by FirebaseUI.
-
-As of version `4.2.1`, FirebaseUI has the following dependency versions:
-
-| Library              | Version                        |
-|----------------------|--------------------------------|
-| `firebase-auth`      | 16.0.5                         |
-| `play-services-auth` | 16.0.1                         |
-| `firebase-database`  | 16.0.3                         |
-| `firebase-firestore` | 17.1.1                         |
-| `firebase-storage`   | 16.0.3                         |
+You can see the specific dependencies associated with each release on the 
+[Releases page][https://github.com/firebase/FirebaseUI-Android/releases].
 
 ### Upgrading dependencies
 

app/build.gradle.kts

@@ -54,6 +54,7 @@ dependencies {
     // demonstrative purposes, and you may find them useful in your own apps; YMMV.
     implementation(Config.Libs.Misc.permissions)
     implementation(Config.Libs.Misc.butterKnife)
+    implementation(Config.Libs.Support.constraint)
     annotationProcessor(Config.Libs.Misc.butterKnifeCompiler)
     debugImplementation(Config.Libs.Misc.leakCanary)
     debugImplementation(Config.Libs.Misc.leakCanaryFragments)

app/src/main/java/com/firebase/uidemo/ChooserActivity.java

@@ -26,6 +26,8 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.firebase.ui.auth.AuthUI;
+import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.uidemo.auth.AnonymousUpgradeActivity;
 import com.firebase.uidemo.auth.AuthUiActivity;
 import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
@@ -43,6 +45,16 @@ public class ChooserActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        if (AuthUI.canHandleIntent(getIntent())) {
+            Intent intent = new Intent(ChooserActivity.this, AuthUiActivity
+                    .class);
+            intent.putExtra(ExtraConstants.EMAIL_LINK_SIGN_IN, getIntent().getData().toString());
+            startActivity(intent);
+            finish();
+            return;
+        }
+
         setContentView(R.layout.activity_chooser);
         ButterKnife.bind(this);
 
@@ -51,7 +63,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mActivities.setHasFixedSize(true);
     }
 
-    private static class ActivityChooserAdapter extends RecyclerView.Adapter<ActivityStarterHolder> {
+    private static class ActivityChooserAdapter
+            extends RecyclerView.Adapter<ActivityStarterHolder> {
         private static final Class[] CLASSES = new Class[]{
                 AuthUiActivity.class,
                 AnonymousUpgradeActivity.class,
@@ -97,7 +110,8 @@ public int getItemCount() {
         }
     }
 
-    private static class ActivityStarterHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+    private static class ActivityStarterHolder extends RecyclerView.ViewHolder
+            implements View.OnClickListener {
         private TextView mTitle;
         private TextView mDescription;
 

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

@@ -57,6 +57,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_anonymous_upgrade);
         ButterKnife.bind(this);
+
+        updateUI();
+
+        // Got here from AuthUIActivity, and we need to deal with a merge conflict
+        // Occurs after catching an email link
+        IdpResponse response = IdpResponse.fromResultIntent(getIntent());
+        if (response != null) {
+            handleSignInResult(RC_SIGN_IN, ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT,
+                    getIntent());
+        }
     }
 
     @OnClick(R.id.anon_sign_in)
@@ -81,10 +91,10 @@ public void onComplete(@NonNull Task<AuthResult> task) {
     public void startAuthUI() {
         List<AuthUI.IdpConfig> providers = ConfigurationUtils.getConfiguredProviders(this);
         Intent intent = AuthUI.getInstance().createSignInIntentBuilder()
-            .setLogo(R.drawable.firebase_auth_120dp)
-            .setAvailableProviders(providers)
-            .enableAnonymousUsersAutoUpgrade()
-            .build();
+                .setLogo(R.drawable.firebase_auth_120dp)
+                .setAvailableProviders(providers)
+                .enableAnonymousUsersAutoUpgrade()
+                .build();
         startActivityForResult(intent, RC_SIGN_IN);
     }
 
@@ -105,7 +115,8 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                         updateUI();
 
                         if (task.isSuccessful()) {
-                            setStatus("Signed in as " + getUserIdentifier(task.getResult().getUser()));
+                            setStatus("Signed in as " + getUserIdentifier(task.getResult()
+                                    .getUser()));
                         } else {
                             Log.w(TAG, "Merge failed", task.getException());
                             setStatus("Failed to resolve merge conflict, see logs.");
@@ -129,15 +140,21 @@ public void onComplete(@NonNull Task<Void> task) {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
+        handleSignInResult(requestCode, resultCode, data);
+    }
+
+    private void handleSignInResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == RC_SIGN_IN) {
             IdpResponse response = IdpResponse.fromResultIntent(data);
             if (response == null) {
                 // User pressed back button
                 return;
             }
             if (resultCode == RESULT_OK) {
-                setStatus("Signed in as " + getUserIdentifier(FirebaseAuth.getInstance().getCurrentUser()));
-            } else if (response.getError().getErrorCode() == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
+                setStatus("Signed in as " + getUserIdentifier(FirebaseAuth.getInstance()
+                        .getCurrentUser()));
+            } else if (response.getError().getErrorCode() == ErrorCodes
+                    .ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
                 setStatus("Merge conflict: user already exists.");
                 mResolveMergeButton.setEnabled(true);
                 mPendingCredential = response.getCredentialForLinking();

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

@@ -33,15 +33,18 @@
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import com.firebase.ui.auth.AuthMethodPickerLayout;
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.util.ConfigurationUtils;
 import com.google.android.gms.common.Scopes;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.ActionCodeSettings;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 
@@ -57,8 +60,10 @@ public class AuthUiActivity extends AppCompatActivity {
 
     private static final String GOOGLE_TOS_URL = "https://www.google.com/policies/terms/";
     private static final String FIREBASE_TOS_URL = "https://firebase.google.com/terms/";
-    private static final String GOOGLE_PRIVACY_POLICY_URL = "https://www.google.com/policies/privacy/";
-    private static final String FIREBASE_PRIVACY_POLICY_URL = "https://firebase.google.com/terms/analytics/#7_privacy";
+    private static final String GOOGLE_PRIVACY_POLICY_URL = "https://www.google" +
+            ".com/policies/privacy/";
+    private static final String FIREBASE_PRIVACY_POLICY_URL = "https://firebase.google" +
+            ".com/terms/analytics/#7_privacy";
 
     private static final int RC_SIGN_IN = 100;
 
@@ -69,9 +74,13 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.twitter_provider) CheckBox mUseTwitterProvider;
     @BindView(R.id.github_provider) CheckBox mUseGitHubProvider;
     @BindView(R.id.email_provider) CheckBox mUseEmailProvider;
+    @BindView(R.id.email_link_provider) CheckBox mUseEmailLinkProvider;
     @BindView(R.id.phone_provider) CheckBox mUsePhoneProvider;
     @BindView(R.id.anonymous_provider) CheckBox mUseAnonymousProvider;
 
+    @BindView(R.id.default_layout) RadioButton mDefaultLayout;
+    @BindView(R.id.custom_layout) RadioButton mCustomLayout;
+
     @BindView(R.id.default_theme) RadioButton mDefaultTheme;
     @BindView(R.id.green_theme) RadioButton mGreenTheme;
     @BindView(R.id.purple_theme) RadioButton mPurpleTheme;
@@ -163,6 +172,41 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
             });
         }
 
+        mUseEmailLinkProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                flipPasswordProviderCheckbox(isChecked);
+            }
+        });
+
+        mUseEmailProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                flipEmailLinkProviderCheckbox(isChecked);
+            }
+        });
+
+        mUseEmailLinkProvider.setChecked(false);
+        mUseEmailProvider.setChecked(true);
+
+        // The custom layout in this app only supports Email and Google providers.
+        mCustomLayout.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                if (checked) {
+                    mUseGoogleProvider.setChecked(true);
+                    mUseEmailProvider.setChecked(true);
+
+                    mUseFacebookProvider.setChecked(false);
+                    mUseTwitterProvider.setChecked(false);
+                    mUseGitHubProvider.setChecked(false);
+                    mUseEmailLinkProvider.setChecked(false);
+                    mUsePhoneProvider.setChecked(false);
+                    mUseAnonymousProvider.setChecked(false);
+                }
+            }
+        });
+
         if (ConfigurationUtils.isGoogleMisconfigured(this)
                 || ConfigurationUtils.isFacebookMisconfigured(this)
                 || ConfigurationUtils.isTwitterMisconfigured(this)
@@ -173,24 +217,79 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
         if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
             mDarkTheme.setChecked(true);
         }
+
+        catchEmailLinkSignIn();
+    }
+
+    public void catchEmailLinkSignIn() {
+        if (getIntent().getExtras() == null) {
+            return;
+        }
+        String link = getIntent().getExtras().getString(ExtraConstants.EMAIL_LINK_SIGN_IN);
+        if (link != null) {
+            signInWithEmailLink(link);
+        }
+    }
+
+    public void flipPasswordProviderCheckbox(boolean emailLinkProviderIsChecked) {
+        if (emailLinkProviderIsChecked) {
+            mUseEmailProvider.setChecked(false);
+        }
+    }
+
+    public void flipEmailLinkProviderCheckbox(boolean passwordProviderIsChecked) {
+        if (passwordProviderIsChecked) {
+            mUseEmailLinkProvider.setChecked(false);
+        }
     }
 
     @OnClick(R.id.sign_in)
     public void signIn() {
-        AuthUI.SignInIntentBuilder builder =  AuthUI.getInstance().createSignInIntentBuilder()
+        startActivityForResult(buildSignInIntent(/*link=*/null), RC_SIGN_IN);
+    }
+
+    public void signInWithEmailLink(@Nullable String link) {
+        startActivityForResult(buildSignInIntent(link), RC_SIGN_IN);
+    }
+
+    @NonNull
+    public Intent buildSignInIntent(@Nullable String link) {
+        AuthUI.SignInIntentBuilder builder = AuthUI.getInstance().createSignInIntentBuilder()
                 .setTheme(getSelectedTheme())
                 .setLogo(getSelectedLogo())
                 .setAvailableProviders(getSelectedProviders())
                 .setIsSmartLockEnabled(mEnableCredentialSelector.isChecked(),
                         mEnableHintSelector.isChecked());
 
+        if (mCustomLayout.isChecked()) {
+            AuthMethodPickerLayout customLayout = new AuthMethodPickerLayout
+                    .Builder(R.layout.auth_method_picker_custom_layout)
+                    .setGoogleButtonId(R.id.custom_google_signin_button)
+                    .setEmailButtonId(R.id.custom_email_signin_clickable_text)
+                    .setTosAndPrivacyPolicyId(R.id.custom_tos_pp)
+                    .build();
+
+            builder.setTheme(R.style.CustomTheme);
+            builder.setAuthMethodPickerLayout(customLayout);
+        }
+
         if (getSelectedTosUrl() != null && getSelectedPrivacyPolicyUrl() != null) {
             builder.setTosAndPrivacyPolicyUrls(
                     getSelectedTosUrl(),
                     getSelectedPrivacyPolicyUrl());
         }
 
-        startActivityForResult(builder.build(), RC_SIGN_IN);
+        if (link != null) {
+            builder.setEmailLink(link);
+        }
+
+        FirebaseAuth auth = FirebaseAuth.getInstance();
+
+        if (auth.getCurrentUser() != null && auth.getCurrentUser().isAnonymous()) {
+            builder.enableAnonymousUsersAutoUpgrade();
+        }
+
+        return builder.build();
     }
 
     @OnClick(R.id.sign_in_silent)
@@ -220,7 +319,7 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
     protected void onResume() {
         super.onResume();
         FirebaseAuth auth = FirebaseAuth.getInstance();
-        if (auth.getCurrentUser() != null) {
+        if (auth.getCurrentUser() != null && getIntent().getExtras() == null) {
             startSignedInActivity(null);
             finish();
         }
@@ -246,6 +345,12 @@ private void handleSignInResponse(int resultCode, @Nullable Intent data) {
                 return;
             }
 
+            if (response.getError().getErrorCode() == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
+                Intent intent = new Intent(this, AnonymousUpgradeActivity.class).putExtra
+                        (ExtraConstants.IDP_RESPONSE, response);
+                startActivity(intent);
+            }
+
             showSnackbar(R.string.unknown_error);
             Log.e(TAG, "Sign-in error: ", response.getError());
         }
@@ -317,6 +422,20 @@ private List<IdpConfig> getSelectedProviders() {
                     .build());
         }
 
+        if (mUseEmailLinkProvider.isChecked()) {
+            ActionCodeSettings actionCodeSettings = ActionCodeSettings.newBuilder()
+                    .setAndroidPackageName("com.firebase.uidemo", true, null)
+                    .setHandleCodeInApp(true)
+                    .setUrl("https://google.com")
+                    .build();
+
+            selectedProviders.add(new IdpConfig.EmailBuilder()
+                    .setAllowNewAccounts(mAllowNewEmailAccounts.isChecked())
+                    .setActionCodeSettings(actionCodeSettings)
+                    .enableEmailLinkSignIn()
+                    .build());
+        }
+
         if (mUsePhoneProvider.isChecked()) {
             selectedProviders.add(new IdpConfig.PhoneBuilder().build());
         }

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

@@ -55,6 +55,8 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
+import static com.firebase.ui.auth.AuthUI.EMAIL_LINK_PROVIDER;
+
 public class SignedInActivity extends AppCompatActivity {
     private static final String TAG = "SignedInActivity";
 
@@ -187,6 +189,9 @@ private void populateProfile(@Nullable IdpResponse response) {
                     case PhoneAuthProvider.PROVIDER_ID:
                         providers.add(getString(R.string.providers_phone));
                         break;
+                    case EMAIL_LINK_PROVIDER:
+                        providers.add(getString(R.string.providers_email_link));
+                        break;
                     case FirebaseAuthProvider.PROVIDER_ID:
                         // Ignore this provider, it's not very meaningful
                         break;