From 7e6071ae310ccef8f3a7d2372ad56067211d2389 Mon Sep 17 00:00:00 2001
From: Sam <samstern@google.com>
Date: Mon, 2 Nov 2020 17:58:25 +0000
Subject: [PATCH 1/8] Begin development on v7.0.0

---
 buildSrc/src/main/kotlin/Config.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 916155ce9..7e3311794 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -1,5 +1,5 @@
 object Config {
-    const val version = "6.4.0"
+    const val version = "7.0.0-SNAPSHOT"
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
     private const val kotlinVersion = "1.3.72"

From 922466bbb2ccf0d829f71fd2946c4655d2519201 Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Tue, 3 Nov 2020 09:55:53 -0500
Subject: [PATCH 2/8] Update major dependencies (#1853)

---
 CHANGELOG.md                                  |  1 +
 .../firebase/uidemo/auth/AuthUiActivity.java  |  7 ++--
 .../uidemo/util/ConfigurationUtils.java       |  1 -
 .../res/layout/activity_anonymous_upgrade.xml | 10 +++---
 app/src/main/res/layout/auth_ui_layout.xml    |  7 ++--
 app/src/main/res/layout/signed_in_layout.xml  |  6 ++--
 .../com/firebase/ui/auth/KickoffActivity.java |  4 +--
 .../data/remote/GenericIdpSignInHandler.java  |  1 -
 .../auth/data/remote/SignInKickstarter.java   |  3 --
 .../credentials/CredentialSaveActivity.java   |  4 +--
 .../ui/auth/ui/email/CheckEmailFragment.java  |  6 ++--
 .../ui/email/EmailLinkCatcherActivity.java    |  4 +--
 .../ui/auth/ui/email/EmailLinkFragment.java   |  6 ++--
 .../email/EmailLinkPromptEmailFragment.java   |  6 ++--
 .../ui/email/RecoverPasswordActivity.java     |  4 +--
 .../auth/ui/email/RegisterEmailFragment.java  |  4 +--
 .../ui/email/WelcomeBackEmailLinkPrompt.java  |  1 -
 .../ui/email/WelcomeBackPasswordPrompt.java   |  6 ++--
 .../auth/ui/idp/AuthMethodPickerActivity.java |  7 ++--
 .../ui/auth/ui/idp/SingleSignInActivity.java  |  3 +-
 .../ui/auth/ui/idp/WelcomeBackIdpPrompt.java  |  4 +--
 .../ui/phone/CheckPhoneNumberFragment.java    | 10 +++---
 .../ui/auth/ui/phone/PhoneActivity.java       |  7 ++--
 .../phone/PhoneNumberVerificationHandler.java |  6 ++--
 .../phone/SubmitConfirmationCodeFragment.java | 12 +++----
 .../ui/auth/util/FirebaseAuthError.java       |  1 -
 .../firebase/ui/auth/util/Preconditions.java  |  6 +++-
 .../email/WelcomeBackPasswordHandler.java     |  3 --
 .../idp/SocialProviderResponseHandler.java    |  1 -
 .../com/firebase/ui/auth/TestApplication.java | 16 ++++++++++
 .../ui/auth/testhelpers/FakeAuthResult.java   |  5 ++-
 .../ui/auth/testhelpers/ResourceMatchers.java |  1 -
 .../ui/auth/ui/phone/SpacedEditTextTest.java  |  3 ++
 ...IdpAnonymousUpgradeLinkingHandlerTest.java |  6 ++--
 .../GenericIdpSignInHandlerTest.java          | 21 ++++++------
 ...kingSocialProviderResponseHandlerTest.java |  1 -
 buildSrc/src/main/kotlin/Config.kt            | 32 +++++++++----------
 .../database/FirebaseArrayOfObjectsTest.java  |  4 +--
 .../ui/database/FirebaseArrayTest.java        |  4 +--
 .../FirebaseIndexArrayOfObjectsTest.java      |  4 +--
 .../ui/database/FirebaseIndexArrayTest.java   |  4 +--
 .../ui/firestore/FirestoreArrayTest.java      |  4 +--
 42 files changed, 131 insertions(+), 115 deletions(-)
 create mode 100644 auth/src/test/java/com/firebase/ui/auth/TestApplication.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29bb..7dcb351d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1 @@
+- Update all dependencies to latest major version.
\ No newline at end of file
diff --git a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
index 261b80447..71cce8b55 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -16,6 +16,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -348,8 +349,10 @@ private void startSignedInActivity(@Nullable IdpResponse response) {
     public void toggleDarkTheme() {
         int mode = mDarkTheme.isChecked() ?
                 AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY;
-        AppCompatDelegate.setDefaultNightMode(mode);
-        getDelegate().setLocalNightMode(mode);
+        if (Build.VERSION.SDK_INT >= 17) {
+            AppCompatDelegate.setDefaultNightMode(mode);
+            getDelegate().setLocalNightMode(mode);
+        }
     }
 
     @StyleRes
diff --git a/app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java b/app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java
index df905d56c..bb7545bdf 100644
--- a/app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java
+++ b/app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java
@@ -8,7 +8,6 @@
 import com.google.firebase.auth.ActionCodeSettings;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/res/layout/activity_anonymous_upgrade.xml b/app/src/main/res/layout/activity_anonymous_upgrade.xml
index 6ac9537e0..7b562c1dd 100644
--- a/app/src/main/res/layout/activity_anonymous_upgrade.xml
+++ b/app/src/main/res/layout/activity_anonymous_upgrade.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,13 +12,13 @@
     android:orientation="vertical"
     tools:context=".auth.AuthUiActivity">
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         style="@style/Base.TextAppearance.AppCompat.Headline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:drawableTop="@drawable/firebase_auth_120dp"
-        android:text="@string/title_anonymous_upgrade" />
+        android:text="@string/title_anonymous_upgrade"
+        app:drawableTopCompat="@drawable/firebase_auth_120dp" />
 
     <TextView
         android:id="@+id/status_text"
diff --git a/app/src/main/res/layout/auth_ui_layout.xml b/app/src/main/res/layout/auth_ui_layout.xml
index 328aaf66e..6e28aa2ca 100644
--- a/app/src/main/res/layout/auth_ui_layout.xml
+++ b/app/src/main/res/layout/auth_ui_layout.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -20,13 +21,13 @@
             android:orientation="vertical"
             android:paddingBottom="32dp">
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 style="@style/Base.TextAppearance.AppCompat.Headline"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:drawableTop="@drawable/firebase_auth_120dp"
-                android:text="@string/launch_title" />
+                android:text="@string/launch_title"
+                app:drawableTopCompat="@drawable/firebase_auth_120dp"/>
 
             <Button
                 android:id="@+id/sign_in"
diff --git a/app/src/main/res/layout/signed_in_layout.xml b/app/src/main/res/layout/signed_in_layout.xml
index 5e53d2fa6..bf90c6808 100644
--- a/app/src/main/res/layout/signed_in_layout.xml
+++ b/app/src/main/res/layout/signed_in_layout.xml
@@ -18,13 +18,13 @@
         android:layout_marginBottom="16dp"
         android:orientation="vertical">
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             style="@style/Base.TextAppearance.AppCompat.Headline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:drawableTop="@drawable/firebase_auth_120dp"
-            android:text="@string/signed_in_header" />
+            android:text="@string/signed_in_header"
+            app:drawableTopCompat="@drawable/firebase_auth_120dp" />
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java b/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
index 41b865e76..226f16d62 100644
--- a/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
@@ -18,7 +18,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class KickoffActivity extends InvisibleActivityBase {
@@ -31,7 +31,7 @@ public static Intent createIntent(Context context, FlowParameters flowParams) {
     @Override
     protected void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mKickstarter = ViewModelProviders.of(this).get(SignInKickstarter.class);
+        mKickstarter = new ViewModelProvider(this).get(SignInKickstarter.class);
         mKickstarter.init(getFlowParams());
         mKickstarter.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
             @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpSignInHandler.java
index 03748bec2..2ec366004 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpSignInHandler.java
@@ -41,7 +41,6 @@
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class GenericIdpSignInHandler extends ProviderSignInBase<AuthUI.IdpConfig> {
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/SignInKickstarter.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/SignInKickstarter.java
index 3f972b0e6..9731903ce 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/SignInKickstarter.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/SignInKickstarter.java
@@ -36,13 +36,10 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
-import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.FirebaseAuthInvalidUserException;
-import com.google.firebase.auth.GithubAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.PhoneAuthProvider;
-import com.google.firebase.auth.TwitterAuthProvider;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java
index d87789744..9807cde63 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java
@@ -16,7 +16,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 /**
  * Invisible Activity used for saving credentials to SmartLock.
@@ -43,7 +43,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         final IdpResponse response = getIntent().getParcelableExtra(ExtraConstants.IDP_RESPONSE);
         Credential credential = getIntent().getParcelableExtra(ExtraConstants.CREDENTIAL);
 
-        mHandler = ViewModelProviders.of(this).get(SmartLockHandler.class);
+        mHandler = new ViewModelProvider(this).get(SmartLockHandler.class);
         mHandler.init(getFlowParams());
         mHandler.setResponse(response);
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
index e698a15f2..4c8b1c64d 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
@@ -32,7 +32,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 import static com.firebase.ui.auth.AuthUI.EMAIL_LINK_PROVIDER;
 
@@ -115,7 +115,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        mHandler = ViewModelProviders.of(this).get(CheckEmailHandler.class);
+        mHandler = new ViewModelProvider(this).get(CheckEmailHandler.class);
         mHandler.init(getFlowParams());
 
         FragmentActivity activity = getActivity();
@@ -124,7 +124,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         }
         mListener = (CheckEmailListener) activity;
 
-        mHandler.getOperation().observe(this, new ResourceObserver<User>(
+        mHandler.getOperation().observe(getViewLifecycleOwner(), new ResourceObserver<User>(
                 this, R.string.fui_progress_dialog_checking_accounts) {
             @Override
             protected void onSuccess(@NonNull User user) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkCatcherActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkCatcherActivity.java
index f5abccc29..e5faf6baf 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkCatcherActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkCatcherActivity.java
@@ -23,7 +23,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class EmailLinkCatcherActivity extends InvisibleActivityBase {
@@ -46,7 +46,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     }
 
     private void initHandler() {
-        mHandler = ViewModelProviders.of(this).get(EmailLinkSignInHandler.class);
+        mHandler = new ViewModelProvider(this).get(EmailLinkSignInHandler.class);
         mHandler.init(getFlowParams());
         mHandler.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
             @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkFragment.java
index e557566ab..a74b1db32 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkFragment.java
@@ -24,7 +24,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@@ -115,11 +115,11 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
     }
 
     private void initHandler() {
-        mEmailLinkSendEmailHandler = ViewModelProviders.of(this).get(EmailLinkSendEmailHandler
+        mEmailLinkSendEmailHandler = new ViewModelProvider(this).get(EmailLinkSendEmailHandler
                 .class);
         mEmailLinkSendEmailHandler.init(getFlowParams());
 
-        mEmailLinkSendEmailHandler.getOperation().observe(this, new ResourceObserver<String>(this,
+        mEmailLinkSendEmailHandler.getOperation().observe(getViewLifecycleOwner(), new ResourceObserver<String>(this,
                 R.string.fui_progress_dialog_sending) {
             @Override
             protected void onSuccess(@NonNull String email) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkPromptEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkPromptEmailFragment.java
index e675d049d..b14d40731 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkPromptEmailFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailLinkPromptEmailFragment.java
@@ -22,7 +22,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 /** Prompts the user to enter their email to finish the cross-device email link sign in flow. */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@@ -90,9 +90,9 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
     }
 
     private void initHandler() {
-        mHandler = ViewModelProviders.of(this).get(EmailLinkSignInHandler.class);
+        mHandler = new ViewModelProvider(this).get(EmailLinkSignInHandler.class);
         mHandler.init(getFlowParams());
-        mHandler.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
+        mHandler.getOperation().observe(getViewLifecycleOwner(), new ResourceObserver<IdpResponse>(this) {
             @Override
             protected void onSuccess(@NonNull IdpResponse response) {
                 mListener.onEmailPromptSuccess(response);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
index 0f2e2d59a..c1409e546 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
@@ -42,7 +42,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.appcompat.app.AlertDialog;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 /**
  * Activity to initiate the "forgot password" flow by asking for the user's email.
@@ -68,7 +68,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fui_forgot_password_layout);
 
-        mHandler = ViewModelProviders.of(this).get(RecoverPasswordHandler.class);
+        mHandler = new ViewModelProvider(this).get(RecoverPasswordHandler.class);
         mHandler.init(getFlowParams());
         mHandler.getOperation().observe(this, new ResourceObserver<String>(
                 this, R.string.fui_progress_dialog_sending) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
index 969ceccbb..623e0f6dc 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
@@ -37,7 +37,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 /**
  * Fragment to display an email/name/password sign up form for new users.
@@ -94,7 +94,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             mUser = User.getUser(savedInstanceState);
         }
 
-        mHandler = ViewModelProviders.of(this).get(EmailProviderResponseHandler.class);
+        mHandler = new ViewModelProvider(this).get(EmailProviderResponseHandler.class);
         mHandler.init(getFlowParams());
         mHandler.getOperation().observe(this, new ResourceObserver<IdpResponse>(
                 this, R.string.fui_progress_dialog_signing_up) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackEmailLinkPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackEmailLinkPrompt.java
index 8ed47079b..2b62ff63c 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackEmailLinkPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackEmailLinkPrompt.java
@@ -1,6 +1,5 @@
 package com.firebase.ui.auth.ui.email;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java
index 33e01bbd6..7528152bd 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java
@@ -43,16 +43,14 @@
 import com.firebase.ui.auth.viewmodel.email.WelcomeBackPasswordHandler;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.firebase.auth.AuthCredential;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthException;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
-import com.google.firebase.auth.FirebaseAuthInvalidUserException;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StringRes;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 /**
  * Activity to link a pre-existing email/password account to a new IDP sign-in by confirming the
@@ -108,7 +106,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         findViewById(R.id.trouble_signing_in).setOnClickListener(this);
 
         // Initialize ViewModel with arguments
-        mHandler = ViewModelProviders.of(this).get(WelcomeBackPasswordHandler.class);
+        mHandler = new ViewModelProvider(this).get(WelcomeBackPasswordHandler.class);
         mHandler.init(getFlowParams());
 
         // Observe the state of the main auth operation
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
index e85078e7a..c55c573c7 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -67,7 +67,6 @@
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 
 import static com.firebase.ui.auth.util.ExtraConstants.GENERIC_OAUTH_BUTTON_ID;
 import static com.firebase.ui.auth.util.ExtraConstants.GENERIC_OAUTH_PROVIDER_ID;
@@ -98,7 +97,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         FlowParameters params = getFlowParams();
         customLayout = params.authMethodPickerLayout;
 
-        mHandler = ViewModelProviders.of(this).get(SocialProviderResponseHandler.class);
+        mHandler = new ViewModelProvider(this).get(SocialProviderResponseHandler.class);
         mHandler.init(params);
 
 
@@ -186,7 +185,7 @@ protected void onFailure(@NonNull Exception e) {
 
     private void populateIdpList(List<IdpConfig> providerConfigs) {
 
-        ViewModelProvider supplier = ViewModelProviders.of(this);
+        ViewModelProvider supplier = new ViewModelProvider(this);
         mProviders = new ArrayList<>();
         for (IdpConfig idpConfig : providerConfigs) {
             @LayoutRes int buttonLayout;
@@ -271,7 +270,7 @@ private String providerOrEmailLinkProvider(@NonNull String providerId) {
     }
 
     private void handleSignInOperation(final IdpConfig idpConfig, View view) {
-        ViewModelProvider supplier = ViewModelProviders.of(this);
+        ViewModelProvider supplier = new ViewModelProvider(this);
         final String providerId = idpConfig.getProviderId();
         final ProviderSignInBase<?> provider;
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/SingleSignInActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/SingleSignInActivity.java
index 3083d9074..c6604a567 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/SingleSignInActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/SingleSignInActivity.java
@@ -30,7 +30,6 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 
 import static com.firebase.ui.auth.util.ExtraConstants.GENERIC_OAUTH_PROVIDER_ID;
 
@@ -59,7 +58,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             return;
         }
 
-        ViewModelProvider supplier = ViewModelProviders.of(this);
+        ViewModelProvider supplier = new ViewModelProvider(this);
 
         mHandler = supplier.get(SocialProviderResponseHandler.class);
         mHandler.init(getFlowParams());
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java
index fa16e77d2..7e587885e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java
@@ -44,7 +44,6 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.GithubAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
 
 import android.text.TextUtils;
@@ -53,7 +52,6 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class WelcomeBackIdpPrompt extends AppCompatBase {
@@ -87,7 +85,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         User existingUser = User.getUser(getIntent());
         IdpResponse requestedUserResponse = IdpResponse.fromResultIntent(getIntent());
-        ViewModelProvider supplier = ViewModelProviders.of(this);
+        ViewModelProvider supplier = new ViewModelProvider(this);
 
         final LinkingSocialProviderResponseHandler handler =
                 supplier.get(LinkingSocialProviderResponseHandler.class);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java
index e37f2ec29..588485be2 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java
@@ -28,7 +28,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 /**
  * Displays country selector and phone number input form for users
@@ -61,9 +61,9 @@ public static CheckPhoneNumberFragment newInstance(Bundle params) {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mVerificationHandler = ViewModelProviders.of(requireActivity())
+        mVerificationHandler = new ViewModelProvider(requireActivity())
                 .get(PhoneNumberVerificationHandler.class);
-        mCheckPhoneHandler = ViewModelProviders.of(this)
+        mCheckPhoneHandler = new ViewModelProvider(this)
                 .get(CheckPhoneHandler.class);
     }
 
@@ -107,7 +107,7 @@ public void onDonePressed() {
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        mCheckPhoneHandler.getOperation().observe(this, new ResourceObserver<PhoneNumber>(this) {
+        mCheckPhoneHandler.getOperation().observe(getViewLifecycleOwner(), new ResourceObserver<PhoneNumber>(this) {
             @Override
             protected void onSuccess(@NonNull PhoneNumber number) {
                 start(number);
@@ -161,7 +161,7 @@ private void onNext() {
         if (phoneNumber == null) {
             mPhoneInputLayout.setError(getString(R.string.fui_invalid_phone_number));
         } else {
-            mVerificationHandler.verifyPhoneNumber(phoneNumber, false);
+            mVerificationHandler.verifyPhoneNumber(requireActivity(), phoneNumber, false);
         }
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneActivity.java
index d4a178fbc..d4caa46fa 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneActivity.java
@@ -34,7 +34,6 @@
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.firebase.ui.auth.viewmodel.phone.PhoneProviderResponseHandler;
 import com.google.android.material.textfield.TextInputLayout;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthException;
 import com.google.firebase.auth.PhoneAuthProvider;
 
@@ -42,7 +41,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.fragment.app.FragmentManager;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 /**
  * Activity to control the entire phone verification flow. Plays host to {@link
@@ -63,7 +62,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.fui_activity_register_phone);
 
         final PhoneProviderResponseHandler handler =
-                ViewModelProviders.of(this).get(PhoneProviderResponseHandler.class);
+                new ViewModelProvider(this).get(PhoneProviderResponseHandler.class);
         handler.init(getFlowParams());
         handler.getOperation().observe(this, new ResourceObserver<IdpResponse>(
                 this, R.string.fui_progress_dialog_signing_in) {
@@ -78,7 +77,7 @@ protected void onFailure(@NonNull Exception e) {
             }
         });
 
-        mPhoneVerifier = ViewModelProviders.of(this).get(PhoneNumberVerificationHandler.class);
+        mPhoneVerifier = new ViewModelProvider(this).get(PhoneNumberVerificationHandler.class);
         mPhoneVerifier.init(getFlowParams());
         mPhoneVerifier.onRestoreInstanceState(savedInstanceState);
         mPhoneVerifier.getOperation().observe(this, new ResourceObserver<PhoneVerification>(
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberVerificationHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberVerificationHandler.java
index 68ba96973..1a833fbfd 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberVerificationHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberVerificationHandler.java
@@ -1,12 +1,12 @@
 package com.firebase.ui.auth.ui.phone;
 
+import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
 
 import com.firebase.ui.auth.data.model.PhoneNumberVerificationRequiredException;
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
-import com.google.android.gms.tasks.TaskExecutors;
 import com.google.firebase.FirebaseException;
 import com.google.firebase.auth.PhoneAuthCredential;
 import com.google.firebase.auth.PhoneAuthProvider;
@@ -27,13 +27,13 @@ public PhoneNumberVerificationHandler(Application application) {
         super(application);
     }
 
-    public void verifyPhoneNumber(final String number, boolean force) {
+    public void verifyPhoneNumber(@NonNull Activity activity, final String number, boolean force) {
         setResult(Resource.<PhoneVerification>forLoading());
         getPhoneAuth().verifyPhoneNumber(
                 number,
                 AUTO_RETRIEVAL_TIMEOUT_SECONDS,
                 TimeUnit.SECONDS,
-                TaskExecutors.MAIN_THREAD,
+                activity,
                 new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
                     @Override
                     public void onVerificationCompleted(@NonNull PhoneAuthCredential credential) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
index 05db21cfd..1f6b5198c 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
@@ -43,7 +43,7 @@
 import androidx.annotation.RestrictTo;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 /**
  * Display confirmation code to verify phone numbers input in {@link CheckPhoneNumberFragment}
@@ -89,7 +89,7 @@ public static SubmitConfirmationCodeFragment newInstance(String phoneNumber) {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mHandler = ViewModelProviders.of(requireActivity())
+        mHandler = new ViewModelProvider(requireActivity())
                 .get(PhoneNumberVerificationHandler.class);
         mPhoneNumber = getArguments().getString(ExtraConstants.PHONE);
         if (savedInstanceState != null) {
@@ -127,10 +127,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        ViewModelProviders.of(requireActivity())
+        new ViewModelProvider(requireActivity())
                 .get(PhoneProviderResponseHandler.class)
                 .getOperation()
-                .observe(this, new Observer<Resource<IdpResponse>>() {
+                .observe(getViewLifecycleOwner(), new Observer<Resource<IdpResponse>>() {
                     @Override
                     public void onChanged(@Nullable Resource<IdpResponse> resource) {
                         if (resource.getState() == State.FAILURE) {
@@ -211,7 +211,7 @@ private void setupEditPhoneNumberTextView() {
         mPhoneTextView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                getFragmentManager().popBackStack();
+                requireActivity().getSupportFragmentManager().popBackStack();
             }
         });
     }
@@ -220,7 +220,7 @@ private void setupResendConfirmationCodeTextView() {
         mResendCodeTextView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mHandler.verifyPhoneNumber(mPhoneNumber, true);
+                mHandler.verifyPhoneNumber(requireActivity(), mPhoneNumber, true);
 
                 mResendCodeTextView.setVisibility(View.GONE);
                 mCountDownTextView.setVisibility(View.VISIBLE);
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/FirebaseAuthError.java b/auth/src/main/java/com/firebase/ui/auth/util/FirebaseAuthError.java
index 206314b8f..9c903de5f 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/FirebaseAuthError.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/FirebaseAuthError.java
@@ -2,7 +2,6 @@
 
 import com.google.firebase.auth.FirebaseAuthException;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 
 /**
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java b/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java
index c233e11f1..0d3d66993 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java
@@ -44,7 +44,11 @@ public static <T> T checkNotNull(
             @NonNull String errorMessageTemplate,
             @Nullable Object... errorMessageArgs) {
         if (val == null) {
-            throw new NullPointerException(String.format(errorMessageTemplate, errorMessageArgs));
+            if (errorMessageArgs == null) {
+                throw new NullPointerException(errorMessageTemplate);
+            } else {
+                throw new NullPointerException(String.format(errorMessageTemplate, errorMessageArgs));
+            }
         }
         return val;
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/WelcomeBackPasswordHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/WelcomeBackPasswordHandler.java
index d1a2c97ee..0d26017f3 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/WelcomeBackPasswordHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/WelcomeBackPasswordHandler.java
@@ -7,7 +7,6 @@
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.data.remote.ProfileMerger;
-import com.firebase.ui.auth.util.FirebaseAuthError;
 import com.firebase.ui.auth.util.data.AuthOperationManager;
 import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.firebase.ui.auth.viewmodel.SignInViewModelBase;
@@ -20,8 +19,6 @@
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseAuthException;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/SocialProviderResponseHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/SocialProviderResponseHandler.java
index 40eacacbe..f85591b72 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/SocialProviderResponseHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/SocialProviderResponseHandler.java
@@ -25,7 +25,6 @@
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthException;
 import com.google.firebase.auth.FirebaseAuthInvalidUserException;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
diff --git a/auth/src/test/java/com/firebase/ui/auth/TestApplication.java b/auth/src/test/java/com/firebase/ui/auth/TestApplication.java
new file mode 100644
index 000000000..3c1292c8a
--- /dev/null
+++ b/auth/src/test/java/com/firebase/ui/auth/TestApplication.java
@@ -0,0 +1,16 @@
+package com.firebase.ui.auth;
+
+import android.app.Application;
+
+/**
+ * Used when Robolectric testing UI components which depend on the theme.s
+ */
+public class TestApplication extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        setTheme(R.style.FirebaseUI);
+    }
+
+}
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java
index 015ae6650..2ed6b4ab1 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java
@@ -49,7 +49,10 @@ public AdditionalUserInfo getAdditionalUserInfo() {
 
     @Override
     public AuthCredential getCredential() {
-        return OAuthProvider.getCredential("provider", "foo", "bar");
+        return OAuthProvider.newCredentialBuilder("provider")
+                .setAccessToken("foo")
+                .setIdToken("bar")
+                .build();
     }
 
     @Override
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/ResourceMatchers.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/ResourceMatchers.java
index 06f9afa78..007e32fcc 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/ResourceMatchers.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/ResourceMatchers.java
@@ -1,7 +1,6 @@
 package com.firebase.ui.auth.testhelpers;
 
 import com.firebase.ui.auth.FirebaseUiException;
-import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.data.model.State;
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java
index 6070953a4..0f3e93c8b 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java
@@ -24,12 +24,14 @@
 import android.util.AttributeSet;
 
 import com.firebase.ui.auth.R;
+import com.firebase.ui.auth.TestApplication;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import androidx.test.core.app.ApplicationProvider;
 
@@ -39,6 +41,7 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(application = TestApplication.class)
 public class SpacedEditTextTest {
     private static final float SPACING_PROPORTION = 1.1f;
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpAnonymousUpgradeLinkingHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpAnonymousUpgradeLinkingHandlerTest.java
index ab3a1182f..13df21ddf 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpAnonymousUpgradeLinkingHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpAnonymousUpgradeLinkingHandlerTest.java
@@ -119,8 +119,10 @@ public void testStartSignIn_anonymousUpgradeLinkingFlow_expectIdpResponseWithCre
                 any(HelperActivityBase.class), any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.forSuccess(mMockAuthResult));
 
-        AuthCredential credential
-                = OAuthProvider.getCredential(MICROSOFT_PROVIDER, ID_TOKEN, ACCESS_TOKEN);
+        AuthCredential credential = OAuthProvider.newCredentialBuilder(MICROSOFT_PROVIDER)
+                .setIdToken(ID_TOKEN)
+                .setAccessToken(ACCESS_TOKEN)
+                .build();
         when(mMockAuthResult.getCredential()).thenReturn(credential);
         when(mMockAuthResult.getUser()).thenReturn(mMockUser);
         when(mMockUser.getDisplayName()).thenReturn(DISPLAY_NAME);
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java
index 2ef83ee72..93a0ea53c 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java
@@ -2,7 +2,6 @@
 
 import android.app.Activity;
 import android.app.Application;
-import android.net.Uri;
 
 import androidx.lifecycle.Observer;
 import androidx.test.core.app.ApplicationProvider;
@@ -21,9 +20,7 @@
 import com.firebase.ui.auth.testhelpers.ResourceMatchers;
 import com.firebase.ui.auth.testhelpers.TestHelper;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.ui.idp.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.util.ExtraConstants;
-import com.firebase.ui.auth.util.data.AuthOperationManager;
 import com.firebase.ui.auth.viewmodel.email.EmailLinkSignInHandler;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
@@ -147,8 +144,10 @@ public void testStartSignIn_normalSignInFlow_expectSuccess() {
 
     @Test
     public void testStartSignIn_normalSignInFlowWithRecoverableError_expectFailure() {
-        AuthCredential credential
-                = OAuthProvider.getCredential(MICROSOFT_PROVIDER, ID_TOKEN, ACCESS_TOKEN);
+        AuthCredential credential = OAuthProvider.newCredentialBuilder(MICROSOFT_PROVIDER)
+                .setIdToken(ID_TOKEN)
+                .setAccessToken(ACCESS_TOKEN)
+                .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
         collisionException.zza(EMAIL).zza(credential);
@@ -247,8 +246,10 @@ public void testStartSignIn_anonymousUpgradeFlow_expectSuccess() {
     public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableError() {
         setupAnonymousUpgrade();
 
-        AuthCredential credential
-                = OAuthProvider.getCredential(MICROSOFT_PROVIDER, ID_TOKEN, ACCESS_TOKEN);
+        AuthCredential credential = OAuthProvider.newCredentialBuilder(MICROSOFT_PROVIDER)
+                .setIdToken(ID_TOKEN)
+                .setAccessToken(ACCESS_TOKEN)
+                .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
         collisionException.zza(EMAIL).zza(credential);
@@ -288,8 +289,10 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableEr
     public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableLinkingError() {
         setupAnonymousUpgrade();
 
-        AuthCredential credential
-                = OAuthProvider.getCredential(MICROSOFT_PROVIDER, ID_TOKEN, ACCESS_TOKEN);
+        AuthCredential credential = OAuthProvider.newCredentialBuilder(MICROSOFT_PROVIDER)
+                .setIdToken(ID_TOKEN)
+                .setAccessToken(ACCESS_TOKEN)
+                .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
         collisionException.zza(EMAIL).zza(credential);
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
index a02e47590..363681b84 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
@@ -23,7 +23,6 @@
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthCredential;
 import com.google.firebase.auth.GoogleAuthProvider;
-import com.google.firebase.auth.OAuthProvider;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 7e3311794..0f8a383ec 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -28,21 +28,21 @@ object Config {
             const val annotations = "androidx.annotation:annotation:1.1.0"
             const val customTabs = "androidx.browser:browser:1.0.0"
             const val cardView = "androidx.cardview:cardview:1.0.0"
-            const val constraint = "androidx.constraintlayout:constraintlayout:1.1.3"
-            const val lifecycleCompiler = "androidx.lifecycle:lifecycle-compiler:2.1.0"
-            const val lifecycleExtensions = "androidx.lifecycle:lifecycle-extensions:2.1.0"
-            const val lifecycleRuntime = "androidx.lifecycle:lifecycle-runtime:2.1.0"
-            const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel:2.1.0"
+            const val constraint = "androidx.constraintlayout:constraintlayout:2.0.4"
+            const val lifecycleCompiler = "androidx.lifecycle:lifecycle-compiler:2.2.0"
+            const val lifecycleExtensions = "androidx.lifecycle:lifecycle-extensions:2.2.0"
+            const val lifecycleRuntime = "androidx.lifecycle:lifecycle-runtime:2.2.0"
+            const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel:2.2.0"
             const val legacySupportv4 = "androidx.legacy:legacy-support-v4:1.0.0"
             const val multidex = "androidx.multidex:multidex:2.0.1"
-            const val paging = "androidx.paging:paging-runtime:2.1.0"
+            const val paging = "androidx.paging:paging-runtime:2.1.2"
             const val recyclerView = "androidx.recyclerview:recyclerview:1.1.0"
 
-            const val design = "com.google.android.material:material:1.1.0"
+            const val design = "com.google.android.material:material:1.2.1"
         }
 
         object Firebase {
-            const val bom = "com.google.firebase:firebase-bom:25.12.0"
+            const val bom = "com.google.firebase:firebase-bom:26.0.0"
             const val auth = "com.google.firebase:firebase-auth"
             const val database = "com.google.firebase:firebase-database"
             const val firestore = "com.google.firebase:firebase-firestore"
@@ -50,16 +50,16 @@ object Config {
         }
 
         object PlayServices {
-            const val auth = "com.google.android.gms:play-services-auth:17.0.0"
+            const val auth = "com.google.android.gms:play-services-auth:18.0.0"
         }
 
         object Provider {
-            const val facebook = "com.facebook.android:facebook-login:4.38.1"
+            const val facebook = "com.facebook.android:facebook-login:8.1.0"
         }
 
         object Misc {
             private const val leakCanaryVersion = "1.6.1"
-            private const val glideVersion = "4.8.0"
+            private const val glideVersion = "4.11.0"
             private const val butterVersion = "10.1.0"
 
             const val leakCanary = "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
@@ -80,15 +80,15 @@ object Config {
 
         object Test {
             const val junit = "junit:junit:4.12"
-            const val junitExt = "androidx.test.ext:junit:1.1.1"
+            const val junitExt = "androidx.test.ext:junit:1.1.2"
             const val truth = "com.google.truth:truth:0.42"
             const val mockito = "org.mockito:mockito-android:2.21.0"
             const val robolectric = "org.robolectric:robolectric:4.3.1"
 
-            const val core = "androidx.test:core:1.2.0"
-            const val archCoreTesting = "androidx.arch.core:core-testing:2.0.0"
-            const val runner = "androidx.test:runner:1.2.0"
-            const val rules = "androidx.test:rules:1.2.0"
+            const val core = "androidx.test:core:1.3.0"
+            const val archCoreTesting = "androidx.arch.core:core-testing:2.1.0"
+            const val runner = "androidx.test:runner:1.3.0"
+            const val rules = "androidx.test:rules:1.3.0"
         }
 
         object Lint {
diff --git a/database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java b/database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java
index d528e00dd..15e43ca97 100644
--- a/database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java
+++ b/database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java
@@ -14,7 +14,7 @@
 
 package com.firebase.ui.database;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.google.firebase.FirebaseApp;
@@ -41,7 +41,7 @@ public class FirebaseArrayOfObjectsTest {
 
     @Before
     public void setUp() throws Exception {
-        FirebaseApp app = getAppInstance(InstrumentationRegistry.getContext());
+        FirebaseApp app = getAppInstance(ApplicationProvider.getApplicationContext());
         mRef = FirebaseDatabase.getInstance(app)
                 .getReference()
                 .child("firebasearray")
diff --git a/database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java b/database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java
index 32e40e301..af7979690 100644
--- a/database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java
+++ b/database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java
@@ -14,7 +14,7 @@
 
 package com.firebase.ui.database;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.google.firebase.FirebaseApp;
@@ -41,7 +41,7 @@ public class FirebaseArrayTest {
 
     @Before
     public void setUp() throws Exception {
-        FirebaseApp app = getAppInstance(InstrumentationRegistry.getContext());
+        FirebaseApp app = getAppInstance(ApplicationProvider.getApplicationContext());
         mRef = FirebaseDatabase.getInstance(app).getReference().child("firebasearray");
         mArray = new FirebaseArray<>(mRef, new ClassSnapshotParser<>(Integer.class));
         mRef.removeValue();
diff --git a/database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayOfObjectsTest.java b/database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayOfObjectsTest.java
index 4d09d1c69..e56b87af3 100644
--- a/database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayOfObjectsTest.java
+++ b/database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayOfObjectsTest.java
@@ -14,7 +14,7 @@
 
 package com.firebase.ui.database;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.google.firebase.database.DatabaseReference;
@@ -42,7 +42,7 @@ public class FirebaseIndexArrayOfObjectsTest {
     @Before
     public void setUp() throws Exception {
         FirebaseDatabase databaseInstance =
-                FirebaseDatabase.getInstance(getAppInstance(InstrumentationRegistry.getContext()));
+                FirebaseDatabase.getInstance(getAppInstance(ApplicationProvider.getApplicationContext()));
         mRef = databaseInstance.getReference().child("firebasearray").child("objects");
         mKeyRef = databaseInstance.getReference().child("firebaseindexarray").child("objects");
 
diff --git a/database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayTest.java b/database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayTest.java
index 0bb65b074..5f13f2316 100644
--- a/database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayTest.java
+++ b/database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayTest.java
@@ -14,7 +14,7 @@
 
 package com.firebase.ui.database;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.google.firebase.database.DatabaseReference;
@@ -43,7 +43,7 @@ public class FirebaseIndexArrayTest {
     @Before
     public void setUp() throws Exception {
         FirebaseDatabase databaseInstance =
-                FirebaseDatabase.getInstance(getAppInstance(InstrumentationRegistry.getContext()));
+                FirebaseDatabase.getInstance(getAppInstance(ApplicationProvider.getApplicationContext()));
         mRef = databaseInstance.getReference().child("firebasearray");
         mKeyRef = databaseInstance.getReference().child("firebaseindexarray");
 
diff --git a/firestore/src/androidTest/java/com/firebase/ui/firestore/FirestoreArrayTest.java b/firestore/src/androidTest/java/com/firebase/ui/firestore/FirestoreArrayTest.java
index f0788297d..701cda6b4 100644
--- a/firestore/src/androidTest/java/com/firebase/ui/firestore/FirestoreArrayTest.java
+++ b/firestore/src/androidTest/java/com/firebase/ui/firestore/FirestoreArrayTest.java
@@ -43,7 +43,7 @@
 import java.util.concurrent.TimeUnit;
 
 import androidx.annotation.NonNull;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static org.junit.Assert.assertTrue;
@@ -104,7 +104,7 @@ public void onError(@NonNull FirebaseFirestoreException e) {
 
     @Before
     public void setUp() throws Exception {
-        FirebaseApp app = getAppInstance(InstrumentationRegistry.getContext());
+        FirebaseApp app = getAppInstance(ApplicationProvider.getApplicationContext());
 
         // Configure Firestore and disable persistence
         FirebaseFirestore.getInstance(app)

From 6507438789eb02b53088b4d86fcb9c824c8e8ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ros=C3=A1rio=20Pereira=20Fernandes?=
 <rosariofernandes51@gmail.com>
Date: Thu, 5 Nov 2020 11:22:41 +0200
Subject: [PATCH 3/8] refactor(authui): upgrade to Firebase Auth v20.0.0
 (#1857)

---
 .../phone/PhoneNumberVerificationHandler.java | 21 +++++++++++--------
 .../ui/auth/viewmodel/AuthViewModelBase.java  | 11 +---------
 .../EmailLinkSendEmailHandlerTest.java        |  2 +-
 .../viewmodel/EmailLinkSignInHandlerTest.java |  4 ++--
 ...kingSocialProviderResponseHandlerTest.java |  4 ++--
 .../PhoneProviderResponseHandlerTest.java     |  4 ++--
 .../viewmodel/RecoverPasswordHandlerTest.java |  2 +-
 .../auth/viewmodel/SmartLockHandlerTest.java  |  2 +-
 .../SocialProviderResponseHandlerTest.java    |  4 ++--
 .../WelcomeBackPasswordHandlerTest.java       |  4 ++--
 10 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberVerificationHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberVerificationHandler.java
index 1a833fbfd..f096b31bf 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberVerificationHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberVerificationHandler.java
@@ -9,6 +9,7 @@
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
 import com.google.firebase.FirebaseException;
 import com.google.firebase.auth.PhoneAuthCredential;
+import com.google.firebase.auth.PhoneAuthOptions;
 import com.google.firebase.auth.PhoneAuthProvider;
 
 import java.util.concurrent.TimeUnit;
@@ -29,12 +30,11 @@ public PhoneNumberVerificationHandler(Application application) {
 
     public void verifyPhoneNumber(@NonNull Activity activity, final String number, boolean force) {
         setResult(Resource.<PhoneVerification>forLoading());
-        getPhoneAuth().verifyPhoneNumber(
-                number,
-                AUTO_RETRIEVAL_TIMEOUT_SECONDS,
-                TimeUnit.SECONDS,
-                activity,
-                new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
+        PhoneAuthOptions.Builder optionsBuilder = PhoneAuthOptions.newBuilder(getAuth())
+                .setPhoneNumber(number)
+                .setTimeout(AUTO_RETRIEVAL_TIMEOUT_SECONDS, TimeUnit.SECONDS)
+                .setActivity(activity)
+                .setCallbacks(new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
                     @Override
                     public void onVerificationCompleted(@NonNull PhoneAuthCredential credential) {
                         setResult(Resource.forSuccess(new PhoneVerification(
@@ -42,7 +42,7 @@ public void onVerificationCompleted(@NonNull PhoneAuthCredential credential) {
                     }
 
                     @Override
-                    public void onVerificationFailed(FirebaseException e) {
+                    public void onVerificationFailed(@NonNull FirebaseException e) {
                         setResult(Resource.<PhoneVerification>forFailure(e));
                     }
 
@@ -54,8 +54,11 @@ public void onCodeSent(@NonNull String verificationId,
                         setResult(Resource.<PhoneVerification>forFailure(
                                 new PhoneNumberVerificationRequiredException(number)));
                     }
-                },
-                force ? mForceResendingToken : null);
+                });
+        if (force) {
+            optionsBuilder.setForceResendingToken(mForceResendingToken);
+        }
+        PhoneAuthProvider.verifyPhoneNumber(optionsBuilder.build());
     }
 
     public void submitVerificationCode(String number, String code) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java
index 0ca294435..8169e5781 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java
@@ -9,7 +9,6 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
-import com.google.firebase.auth.PhoneAuthProvider;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
@@ -19,7 +18,6 @@
 public abstract class AuthViewModelBase<T> extends OperableViewModel<FlowParameters, Resource<T>> {
     private CredentialsClient mCredentialsClient;
     private FirebaseAuth mAuth;
-    private PhoneAuthProvider mPhoneAuth;
 
     protected AuthViewModelBase(Application application) {
         super(application);
@@ -29,7 +27,6 @@ protected AuthViewModelBase(Application application) {
     protected void onCreate() {
         FirebaseApp app = FirebaseApp.getInstance(getArguments().appName);
         mAuth = FirebaseAuth.getInstance(app);
-        mPhoneAuth = PhoneAuthProvider.getInstance(mAuth);
         mCredentialsClient = GoogleApiUtils.getCredentialsClient(getApplication());
     }
 
@@ -42,10 +39,6 @@ protected FirebaseAuth getAuth() {
         return mAuth;
     }
 
-    protected PhoneAuthProvider getPhoneAuth() {
-        return mPhoneAuth;
-    }
-
     protected CredentialsClient getCredentialsClient() {
         return mCredentialsClient;
     }
@@ -53,11 +46,9 @@ protected CredentialsClient getCredentialsClient() {
     @VisibleForTesting
     public void initializeForTesting(FlowParameters parameters,
                                      FirebaseAuth auth,
-                                     CredentialsClient client,
-                                     PhoneAuthProvider phoneAuth) {
+                                     CredentialsClient client) {
         setArguments(parameters);
         mAuth = auth;
         mCredentialsClient = client;
-        mPhoneAuth = phoneAuth;
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/EmailLinkSendEmailHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/EmailLinkSendEmailHandlerTest.java
index 72cf1af3b..b11f54710 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/EmailLinkSendEmailHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/EmailLinkSendEmailHandlerTest.java
@@ -62,7 +62,7 @@ public void setUp() {
         mHandler = new EmailLinkSendEmailHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(new ArrayList<String>());
 
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
         mPersistenceManager = EmailLinkPersistenceManager.getInstance();
     }
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/EmailLinkSignInHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/EmailLinkSignInHandlerTest.java
index f9efbbe32..20389f8dd 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/EmailLinkSignInHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/EmailLinkSignInHandlerTest.java
@@ -659,7 +659,7 @@ private void setupAnonymousUpgrade() {
                 EmailAuthProvider.PROVIDER_ID), /* enableAnonymousUpgrade */ true);
 
         testParams.emailLink = mHandler.getArguments().emailLink;
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
 
         // Mock isAnonymous() to return true so canUpgradeAnonymous will return true
         when(mMockAnonUser.isAnonymous()).thenReturn(true);
@@ -679,6 +679,6 @@ private void initializeHandlerWithSessionInfo(@Nullable String sessionId,
 
         testParams.emailLink = EMAIL_LINK + continueUrlBuilder.build();
 
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
index 363681b84..ba37530d8 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
@@ -79,7 +79,7 @@ public void setUp() {
         mHandler = new LinkingSocialProviderResponseHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 GoogleAuthProvider.PROVIDER_ID));
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
     }
 
     @Test
@@ -279,7 +279,7 @@ public void testSignIn_genericIdpLinkingFlow_expectImmediateLink() {
     private void setupAnonymousUpgrade() {
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 GoogleAuthProvider.PROVIDER_ID), true);
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
         when(mMockAuth.getCurrentUser()).thenReturn(mMockUser);
         when(mMockUser.isAnonymous()).thenReturn(true);
         AuthOperationManager.getInstance().mScratchAuth = mScratchMockAuth;
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java
index e77cbb8f4..37a267024 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java
@@ -62,7 +62,7 @@ public void setUp() {
         mHandler = new PhoneProviderResponseHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 PhoneAuthProvider.PROVIDER_ID));
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
     }
 
     @Test
@@ -138,7 +138,7 @@ public void testSignIn_autoUpgradeAnonymousEnabledWithExistingUser_expectMergeFa
     private void setupAnonymousUpgrade() {
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 PhoneAuthProvider.PROVIDER_ID), true);
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
         when(mMockAuth.getCurrentUser()).thenReturn(mMockUser);
         when(mMockUser.isAnonymous()).thenReturn(true);
     }
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/RecoverPasswordHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/RecoverPasswordHandlerTest.java
index 6f7f11256..cd1d699ff 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/RecoverPasswordHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/RecoverPasswordHandlerTest.java
@@ -51,7 +51,7 @@ public void setUp() {
 
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 EmailAuthProvider.PROVIDER_ID));
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
 
         mPasswordResetSettings = ActionCodeSettings.newBuilder()
                 .setAndroidPackageName("com.firebase.uidemo", true, null)
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/SmartLockHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/SmartLockHandlerTest.java
index d034d6165..dd6812e3e 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/SmartLockHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/SmartLockHandlerTest.java
@@ -62,7 +62,7 @@ public void setUp() {
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 EmailAuthProvider.PROVIDER_ID));
 
-        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials);
         mHandler.setResponse(new IdpResponse.Builder(
                 new User.Builder(EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build()
         ).build());
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/SocialProviderResponseHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/SocialProviderResponseHandlerTest.java
index c767b811a..60a418c98 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/SocialProviderResponseHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/SocialProviderResponseHandlerTest.java
@@ -73,7 +73,7 @@ public void setUp() {
         mHandler = new SocialProviderResponseHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(AuthUI.SUPPORTED_PROVIDERS);
 
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
     }
 
     @Test
@@ -334,7 +334,7 @@ private void setupAnonymousUpgrade() {
         // enableAnonymousUpgrade must be set to true
         FlowParameters testParams = TestHelper.getFlowParameters(AuthUI.SUPPORTED_PROVIDERS,
                 /* enableAnonymousUpgrade */ true);
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
 
         when(mUser.isAnonymous()).thenReturn(true);
         when(mMockAuth.getCurrentUser()).thenReturn(mUser);
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/WelcomeBackPasswordHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/WelcomeBackPasswordHandlerTest.java
index a23b21c3d..694004f9e 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/WelcomeBackPasswordHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/WelcomeBackPasswordHandlerTest.java
@@ -68,7 +68,7 @@ public void setUp() {
 
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 EmailAuthProvider.PROVIDER_ID));
-        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials);
     }
 
     @Test
@@ -230,7 +230,7 @@ private void setupAnonymousUpgrade() {
         // enableAnonymousUpgrade must be set to true
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 EmailAuthProvider.PROVIDER_ID), /* enableAnonymousUpgrade */ true);
-        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials);
 
         // Mock isAnonymous() to return true so canUpgradeAnonymous will return true
         when(mUser.isAnonymous()).thenReturn(true);

From 5342e3dc69221069745945ef613be7eeaf0573eb Mon Sep 17 00:00:00 2001
From: Aryan Najafi <aryannjfi@gmail.com>
Date: Mon, 9 Nov 2020 12:04:32 -0600
Subject: [PATCH 4/8] Switch to AppCompatButton compound drawables in auth
 provider buttons (#1861)

---
 CHANGELOG.md                                  |  3 +-
 .../auth_method_picker_custom_layout.xml      |  7 +-
 .../auth_method_picker_custom_layout.xml      |  7 +-
 .../util/ui/SupportVectorDrawablesButton.java | 96 -------------------
 .../main/res/layout/fui_idp_button_apple.xml  |  2 +-
 .../res/layout/fui_idp_button_facebook.xml    |  3 +-
 .../main/res/layout/fui_idp_button_github.xml |  3 +-
 .../main/res/layout/fui_idp_button_google.xml |  3 +-
 .../res/layout/fui_idp_button_microsoft.xml   |  2 +-
 .../res/layout/fui_idp_button_twitter.xml     |  3 +-
 .../main/res/layout/fui_idp_button_yahoo.xml  |  2 +-
 .../layout/fui_provider_button_anonymous.xml  |  2 +-
 .../res/layout/fui_provider_button_email.xml  |  2 +-
 .../res/layout/fui_provider_button_phone.xml  |  2 +-
 auth/src/main/res/values/attrs.xml            |  7 --
 15 files changed, 14 insertions(+), 130 deletions(-)
 delete mode 100644 auth/src/main/java/com/firebase/ui/auth/util/ui/SupportVectorDrawablesButton.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dcb351d5..99f39d0a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1,2 @@
-- Update all dependencies to latest major version.
\ No newline at end of file
+- Update all dependencies to latest major version.
+- [Auth] Remove SupportVectorDrawablesButton (#1860) (contributed by @AryanNajafi)
diff --git a/app/src/main/res/layout-land/auth_method_picker_custom_layout.xml b/app/src/main/res/layout-land/auth_method_picker_custom_layout.xml
index 97c6d9f94..f8714d86d 100644
--- a/app/src/main/res/layout-land/auth_method_picker_custom_layout.xml
+++ b/app/src/main/res/layout-land/auth_method_picker_custom_layout.xml
@@ -90,12 +90,7 @@
 
     </FrameLayout>
 
-    <!--
-      NOTE: This sample app uses this class from the FirebaseUI library to show the Google Sign
-      in button. However this button is NOT considered part of the public API and you should not
-      use it in your own app.
-    -->
-    <com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+    <Button
         android:id="@+id/custom_google_signin_button"
         style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/auth_method_picker_custom_layout.xml b/app/src/main/res/layout/auth_method_picker_custom_layout.xml
index e5f4ec016..d0944e73b 100644
--- a/app/src/main/res/layout/auth_method_picker_custom_layout.xml
+++ b/app/src/main/res/layout/auth_method_picker_custom_layout.xml
@@ -73,12 +73,7 @@
 
     </FrameLayout>
 
-    <!--
-      NOTE: This sample app uses this class from the FirebaseUI library to show the Google Sign
-      in button. However this button is NOT considered part of the public API and you should not
-      use it in your own app.
-    -->
-    <com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+    <Button
         android:id="@+id/custom_google_signin_button"
         style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
         android:layout_width="wrap_content"
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/ui/SupportVectorDrawablesButton.java b/auth/src/main/java/com/firebase/ui/auth/util/ui/SupportVectorDrawablesButton.java
deleted file mode 100644
index 15f89b80e..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/util/ui/SupportVectorDrawablesButton.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.firebase.ui.auth.util.ui;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.util.AttributeSet;
-
-import com.firebase.ui.auth.R;
-
-import androidx.annotation.RestrictTo;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.widget.AppCompatButton;
-import androidx.core.widget.TextViewCompat;
-
-/**
- * A custom button that supports using vector drawables with the {@code
- * android:drawable[Start/End/Top/Bottom]} attribute pre-L.
- * <p>
- * AppCompat can only load vector drawables with srcCompat pre-L and doesn't provide a similar
- * compatibility attribute for compound drawables. Thus, we must load compound drawables at runtime
- * using AppCompat and inject them into the button to support pre-L devices.
- */
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class SupportVectorDrawablesButton extends AppCompatButton {
-    public SupportVectorDrawablesButton(Context context) {
-        super(context);
-    }
-
-    public SupportVectorDrawablesButton(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initSupportVectorDrawablesAttrs(attrs);
-    }
-
-    public SupportVectorDrawablesButton(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initSupportVectorDrawablesAttrs(attrs);
-    }
-
-    /**
-     * Loads the compound drawables natively on L+ devices and using AppCompat pre-L.
-     * <p>
-     * <i>Note:</i> If we ever need a TextView with compound drawables, this same technique is
-     * applicable.
-     */
-    private void initSupportVectorDrawablesAttrs(AttributeSet attrs) {
-        if (attrs == null) { return; }
-
-        TypedArray attributeArray = getContext().obtainStyledAttributes(
-                attrs,
-                R.styleable.SupportVectorDrawablesButton);
-
-        Drawable drawableStart = null;
-        Drawable drawableEnd = null;
-        Drawable drawableTop = null;
-        Drawable drawableBottom = null;
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            drawableStart = attributeArray.getDrawable(
-                    R.styleable.SupportVectorDrawablesButton_drawableStartCompat);
-            drawableEnd = attributeArray.getDrawable(
-                    R.styleable.SupportVectorDrawablesButton_drawableEndCompat);
-            drawableTop = attributeArray.getDrawable(
-                    R.styleable.SupportVectorDrawablesButton_drawableTopCompat);
-            drawableBottom = attributeArray.getDrawable(
-                    R.styleable.SupportVectorDrawablesButton_drawableBottomCompat);
-        } else {
-            int drawableStartId = attributeArray.getResourceId(
-                    R.styleable.SupportVectorDrawablesButton_drawableStartCompat, -1);
-            int drawableEndId = attributeArray.getResourceId(
-                    R.styleable.SupportVectorDrawablesButton_drawableEndCompat, -1);
-            int drawableTopId = attributeArray.getResourceId(
-                    R.styleable.SupportVectorDrawablesButton_drawableTopCompat, -1);
-            int drawableBottomId = attributeArray.getResourceId(
-                    R.styleable.SupportVectorDrawablesButton_drawableBottomCompat, -1);
-
-            if (drawableStartId != -1) {
-                drawableStart = AppCompatResources.getDrawable(getContext(), drawableStartId);
-            }
-            if (drawableEndId != -1) {
-                drawableEnd = AppCompatResources.getDrawable(getContext(), drawableEndId);
-            }
-            if (drawableTopId != -1) {
-                drawableTop = AppCompatResources.getDrawable(getContext(), drawableTopId);
-            }
-            if (drawableBottomId != -1) {
-                drawableBottom = AppCompatResources.getDrawable(getContext(), drawableBottomId);
-            }
-        }
-
-        TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                this, drawableStart, drawableTop, drawableEnd, drawableBottom);
-
-        attributeArray.recycle();
-    }
-}
diff --git a/auth/src/main/res/layout/fui_idp_button_apple.xml b/auth/src/main/res/layout/fui_idp_button_apple.xml
index 497bcff2b..699addeec 100644
--- a/auth/src/main/res/layout/fui_idp_button_apple.xml
+++ b/auth/src/main/res/layout/fui_idp_button_apple.xml
@@ -1,4 +1,4 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/apple_signin_button"
     style="@style/FirebaseUI.Button.AccountChooser.AppleButton"
     android:text="@string/fui_sign_in_with_apple"/>
diff --git a/auth/src/main/res/layout/fui_idp_button_facebook.xml b/auth/src/main/res/layout/fui_idp_button_facebook.xml
index 47eb88122..4135aa461 100644
--- a/auth/src/main/res/layout/fui_idp_button_facebook.xml
+++ b/auth/src/main/res/layout/fui_idp_button_facebook.xml
@@ -1,4 +1,3 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/FirebaseUI.Button.AccountChooser.FacebookButton"
     android:text="@string/fui_sign_in_with_facebook" />
diff --git a/auth/src/main/res/layout/fui_idp_button_github.xml b/auth/src/main/res/layout/fui_idp_button_github.xml
index 06e970841..e8fd1ad8d 100644
--- a/auth/src/main/res/layout/fui_idp_button_github.xml
+++ b/auth/src/main/res/layout/fui_idp_button_github.xml
@@ -1,4 +1,3 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/FirebaseUI.Button.AccountChooser.GitHubButton"
     android:text="@string/fui_sign_in_with_github" />
diff --git a/auth/src/main/res/layout/fui_idp_button_google.xml b/auth/src/main/res/layout/fui_idp_button_google.xml
index ff5e282c6..24371fbcc 100644
--- a/auth/src/main/res/layout/fui_idp_button_google.xml
+++ b/auth/src/main/res/layout/fui_idp_button_google.xml
@@ -1,4 +1,3 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
     android:text="@string/fui_sign_in_with_google" />
diff --git a/auth/src/main/res/layout/fui_idp_button_microsoft.xml b/auth/src/main/res/layout/fui_idp_button_microsoft.xml
index 5597164c7..fcb41d0a5 100644
--- a/auth/src/main/res/layout/fui_idp_button_microsoft.xml
+++ b/auth/src/main/res/layout/fui_idp_button_microsoft.xml
@@ -1,4 +1,4 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/microsoft_signin_button"
     style="@style/FirebaseUI.Button.AccountChooser.MicrosoftButton"
     android:text="@string/fui_sign_in_with_microsoft"/>
diff --git a/auth/src/main/res/layout/fui_idp_button_twitter.xml b/auth/src/main/res/layout/fui_idp_button_twitter.xml
index f186afebc..bd2c59697 100644
--- a/auth/src/main/res/layout/fui_idp_button_twitter.xml
+++ b/auth/src/main/res/layout/fui_idp_button_twitter.xml
@@ -1,4 +1,3 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/FirebaseUI.Button.AccountChooser.TwitterButton"
     android:text="@string/fui_sign_in_with_twitter" />
diff --git a/auth/src/main/res/layout/fui_idp_button_yahoo.xml b/auth/src/main/res/layout/fui_idp_button_yahoo.xml
index 3a5a61b80..e54c49317 100644
--- a/auth/src/main/res/layout/fui_idp_button_yahoo.xml
+++ b/auth/src/main/res/layout/fui_idp_button_yahoo.xml
@@ -1,4 +1,4 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/yahoo_signin_button"
     style="@style/FirebaseUI.Button.AccountChooser.YahooButton"
     android:text="@string/fui_sign_in_with_yahoo" />
diff --git a/auth/src/main/res/layout/fui_provider_button_anonymous.xml b/auth/src/main/res/layout/fui_provider_button_anonymous.xml
index 361d3c007..1fc8a9bec 100644
--- a/auth/src/main/res/layout/fui_provider_button_anonymous.xml
+++ b/auth/src/main/res/layout/fui_provider_button_anonymous.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+<Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/anonymous_button"
     style="@style/FirebaseUI.Button.AccountChooser.AnonymousButton"
diff --git a/auth/src/main/res/layout/fui_provider_button_email.xml b/auth/src/main/res/layout/fui_provider_button_email.xml
index 5aeb41bc1..3df0dd4b1 100644
--- a/auth/src/main/res/layout/fui_provider_button_email.xml
+++ b/auth/src/main/res/layout/fui_provider_button_email.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+<Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/email_button"
diff --git a/auth/src/main/res/layout/fui_provider_button_phone.xml b/auth/src/main/res/layout/fui_provider_button_phone.xml
index 4deb10967..41137c436 100644
--- a/auth/src/main/res/layout/fui_provider_button_phone.xml
+++ b/auth/src/main/res/layout/fui_provider_button_phone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+<Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/phone_button"
diff --git a/auth/src/main/res/values/attrs.xml b/auth/src/main/res/values/attrs.xml
index a65d9d3ca..596c7c0ee 100644
--- a/auth/src/main/res/values/attrs.xml
+++ b/auth/src/main/res/values/attrs.xml
@@ -5,11 +5,4 @@
         <attr name="spacingProportion" format="float" />
     </declare-styleable>
 
-    <declare-styleable name="SupportVectorDrawablesButton">
-        <attr name="drawableStartCompat" format="reference" />
-        <attr name="drawableEndCompat" format="reference" />
-        <attr name="drawableTopCompat" format="reference" />
-        <attr name="drawableBottomCompat" format="reference" />
-    </declare-styleable>
-
 </resources>

From 7254e91380e8c8a34b9da800c788971d7d951b08 Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Wed, 11 Nov 2020 06:47:23 -0500
Subject: [PATCH 5/8] Add support for Auth Emulator (#1854)

---
 .gitignore                                    |  1 +
 CHANGELOG.md                                  |  3 +-
 app/src/main/AndroidManifest.xml              |  3 +-
 .../firebase/uidemo/auth/AuthUiActivity.java  | 26 ++++++-
 app/src/main/res/layout/auth_ui_layout.xml    |  7 ++
 app/src/main/res/values/strings.xml           |  1 +
 .../java/com/firebase/ui/auth/AuthUI.java     | 60 ++++++++++++++--
 .../com/firebase/ui/auth/IdpResponse.java     |  2 +
 .../data/remote/AnonymousSignInHandler.java   | 18 ++---
 .../auth/data/remote/EmailSignInHandler.java  | 18 +++--
 .../data/remote/FacebookSignInHandler.java    | 15 ++--
 ...ericIdpAnonymousUpgradeLinkingHandler.java | 21 ++----
 .../data/remote/GenericIdpSignInHandler.java  | 70 +++++++++++++-----
 .../auth/data/remote/GoogleSignInHandler.java | 15 ++--
 .../auth/data/remote/PhoneSignInHandler.java  | 16 ++---
 .../remote/SingleProviderSignInHandler.java   | 25 +++++++
 .../ui/auth/ui/HelperActivityBase.java        |  9 +++
 .../auth/ui/idp/AuthMethodPickerActivity.java | 71 +++++++++----------
 .../ui/auth/ui/idp/SingleSignInActivity.java  | 39 +++++-----
 .../ui/auth/ui/idp/WelcomeBackIdpPrompt.java  | 52 +++++++-------
 .../auth/util/data/AuthOperationManager.java  |  9 ++-
 .../ui/auth/viewmodel/AuthViewModelBase.java  |  2 +
 .../ui/auth/viewmodel/ProviderSignInBase.java | 11 +++
 .../ui/auth/testhelpers/TestHelper.java       | 16 ++++-
 .../ui/idp/AuthMethodPickerActivityTest.java  |  1 +
 .../viewmodel/AnonymousSignInHandlerTest.java | 20 ++++--
 ...IdpAnonymousUpgradeLinkingHandlerTest.java | 35 +++++----
 .../GenericIdpSignInHandlerTest.java          | 31 +++++---
 ...kingSocialProviderResponseHandlerTest.java |  2 -
 29 files changed, 396 insertions(+), 203 deletions(-)
 create mode 100644 auth/src/main/java/com/firebase/ui/auth/data/remote/SingleProviderSignInHandler.java

diff --git a/.gitignore b/.gitignore
index 0195ac149..ca0f434ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ google-services.json
 
 crashlytics-build.properties
 auth/src/main/res/values/com_crashlytics_export_strings.xml
+*.log
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99f39d0a8..cd4e8a8a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,3 @@
-- Update all dependencies to latest major version.
+- [All] Update all dependencies to latest major version.
 - [Auth] Remove SupportVectorDrawablesButton (#1860) (contributed by @AryanNajafi)
+- [Auth] Add `AuthUI#useEmulator()` method  to use FirebaseUI with the Firebase Auth Emulator (#1849)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9c29fc809..d6c822655 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
+        android:usesCleartextTraffic="true">
 
         <activity android:name=".ChooserActivity">
             <intent-filter>
diff --git a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
index 71cce8b55..adab4512f 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -109,6 +109,7 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.hint_selector_enabled) CheckBox mEnableHintSelector;
     @BindView(R.id.allow_new_email_accounts) CheckBox mAllowNewEmailAccounts;
     @BindView(R.id.require_name) CheckBox mRequireName;
+    @BindView(R.id.use_auth_emulator) CheckBox mUseEmulator;
 
     @NonNull
     public static Intent createIntent(@NonNull Context context) {
@@ -189,6 +190,17 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
             }
         });
 
+        // useEmulator can't be reversed until the FirebaseApp is cleared, so we make this
+        // checkbox "sticky" until the app is restarted
+        mUseEmulator.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    mUseEmulator.setEnabled(false);
+                }
+            }
+        });
+
         if (ConfigurationUtils.isGoogleMisconfigured(this)
                 || ConfigurationUtils.isFacebookMisconfigured(this)) {
             showSnackbar(R.string.configuration_required);
@@ -232,9 +244,19 @@ public void signInWithEmailLink(@Nullable String link) {
         startActivityForResult(buildSignInIntent(link), RC_SIGN_IN);
     }
 
+    @NonNull
+    public AuthUI getAuthUI() {
+        AuthUI authUI = AuthUI.getInstance();
+        if (mUseEmulator.isChecked()) {
+            authUI.useEmulator("10.0.2.2", 9099);
+        }
+
+        return authUI;
+    }
+
     @NonNull
     public Intent buildSignInIntent(@Nullable String link) {
-        AuthUI.SignInIntentBuilder builder = AuthUI.getInstance().createSignInIntentBuilder()
+        AuthUI.SignInIntentBuilder builder = getAuthUI().createSignInIntentBuilder()
                 .setTheme(getSelectedTheme())
                 .setLogo(getSelectedLogo())
                 .setAvailableProviders(getSelectedProviders())
@@ -274,7 +296,7 @@ public Intent buildSignInIntent(@Nullable String link) {
 
     @OnClick(R.id.sign_in_silent)
     public void silentSignIn() {
-        AuthUI.getInstance().silentSignIn(this, getSelectedProviders())
+        getAuthUI().silentSignIn(this, getSelectedProviders())
                 .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
                     @Override
                     public void onComplete(@NonNull Task<AuthResult> task) {
diff --git a/app/src/main/res/layout/auth_ui_layout.xml b/app/src/main/res/layout/auth_ui_layout.xml
index 6e28aa2ca..88ab03b47 100644
--- a/app/src/main/res/layout/auth_ui_layout.xml
+++ b/app/src/main/res/layout/auth_ui_layout.xml
@@ -347,6 +347,13 @@
                 android:checked="true"
                 android:text="@string/options_require_name" />
 
+            <CheckBox
+                android:id="@+id/use_auth_emulator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="@string/options_use_auth_emulator" />
+
         </LinearLayout>
 
     </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 40fd8d22f..381755117 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,6 +68,7 @@
     <string name="options_enable_hint_selector">Enable Smart Lock\'s hint selector</string>
     <string name="options_allow_new_email_acccount">Allow new account creation</string>
     <string name="options_require_name">Require first/last name with email accounts.</string>
+    <string name="options_use_auth_emulator">Connect to auth emulator (localhost:9099).</string>
 
     <string name="configuration_required">Configuration required - see README.md</string>
     <string name="google_label_missing_config">Google configuration missing</string>
diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
index 07665f983..1c39c6d16 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -109,7 +109,6 @@ public final class AuthUI {
     public static final String YAHOO_PROVIDER = "yahoo.com";
     public static final String APPLE_PROVIDER = "apple.com";
 
-
     /**
      * Default value for logo resource, omits the logo from the {@link AuthMethodPickerActivity}.
      */
@@ -161,6 +160,9 @@ public final class AuthUI {
     private final FirebaseApp mApp;
     private final FirebaseAuth mAuth;
 
+    private String mEmulatorHost = null;
+    private int mEmulatorPort = -1;
+
     private AuthUI(FirebaseApp app) {
         mApp = app;
         mAuth = FirebaseAuth.getInstance(mApp);
@@ -196,6 +198,16 @@ public static AuthUI getInstance() {
         return getInstance(FirebaseApp.getInstance());
     }
 
+    /**
+     * Retrieves the {@link AuthUI} instance associated the the specified app name.
+     *
+     * @throws IllegalStateException if the app is not initialized.
+     */
+    @NonNull
+    public static AuthUI getInstance(@NonNull String appName) {
+        return getInstance(FirebaseApp.getInstance(appName));
+    }
+
     /**
      * Retrieves the {@link AuthUI} instance associated the the specified app.
      */
@@ -223,6 +235,18 @@ public static AuthUI getInstance(@NonNull FirebaseApp app) {
         return authUi;
     }
 
+    @NonNull
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public FirebaseApp getApp() {
+        return mApp;
+    }
+
+    @NonNull
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public FirebaseAuth getAuth() {
+        return mAuth;
+    }
+
     /**
      * Returns true if AuthUI can handle the intent.
      * <p>
@@ -460,6 +484,34 @@ public Task<Void> then(@NonNull Task<Void> task) {
         });
     }
 
+    /**
+     * Connect to the Firebase Authentication emulator.
+     * @see FirebaseAuth#useEmulator(String, int)
+     */
+    public void useEmulator(@NonNull String host, int port) {
+        Preconditions.checkArgument(port >= 0, "Port must be >= 0");
+        Preconditions.checkArgument(port <= 65535, "Port must be <= 65535");
+        mEmulatorHost = host;
+        mEmulatorPort = port;
+
+        mAuth.useEmulator(host, port);
+    }
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public boolean isUseEmulator() {
+        return mEmulatorHost != null && mEmulatorPort >= 0;
+    }
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public String getEmulatorHost() {
+        return mEmulatorHost;
+    }
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public int getEmulatorPort() {
+        return mEmulatorPort;
+    }
+
     private Task<Void> signOutIdps(@NonNull Context context) {
         if (ProviderAvailability.IS_FACEBOOK_AVAILABLE) {
             LoginManager.getInstance().logOut();
@@ -1160,9 +1212,9 @@ public YahooBuilder() {
          */
         public static class GenericOAuthProviderBuilder extends Builder {
 
-            GenericOAuthProviderBuilder(@NonNull String providerId,
-                                        @NonNull String providerName,
-                                        int buttonId) {
+            public GenericOAuthProviderBuilder(@NonNull String providerId,
+                                               @NonNull String providerName,
+                                               int buttonId) {
                 super(providerId);
 
                 Preconditions.checkNotNull(providerId, "The provider ID cannot be null.");
diff --git a/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java b/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
index 113f73db2..ea7c29a08 100644
--- a/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
+++ b/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
@@ -381,6 +381,7 @@ public IdpResponse build() {
             }
 
             String providerId = mUser.getProviderId();
+
             if (AuthUI.SOCIAL_PROVIDERS.contains(providerId) && TextUtils.isEmpty(mToken)) {
                 throw new IllegalStateException(
                         "Token cannot be null when using a non-email provider.");
@@ -390,6 +391,7 @@ public IdpResponse build() {
                 throw new IllegalStateException(
                         "Secret cannot be null when using the Twitter provider.");
             }
+
             return new IdpResponse(mUser, mToken, mSecret, mPendingCredential, mIsNewUser);
         }
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/AnonymousSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/AnonymousSignInHandler.java
index 81a0426d9..6e531c3fb 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/AnonymousSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/AnonymousSignInHandler.java
@@ -23,13 +23,13 @@
 
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class AnonymousSignInHandler extends ProviderSignInBase<FlowParameters> {
+public class AnonymousSignInHandler extends SingleProviderSignInHandler<FlowParameters> {
 
     @VisibleForTesting
     public FirebaseAuth mAuth;
 
     public AnonymousSignInHandler(Application application) {
-        super(application);
+        super(application, AuthUI.ANONYMOUS_PROVIDER);
     }
 
     @Override
@@ -38,7 +38,9 @@ protected void onCreate() {
     }
 
     @Override
-    public void startSignIn(@NonNull HelperActivityBase activity) {
+    public void startSignIn(@NonNull FirebaseAuth auth,
+                            @NonNull HelperActivityBase activity,
+                            @NonNull String providerId) {
         setResult(Resource.<IdpResponse>forLoading());
 
         // Calling signInAnonymously() will always return the same anonymous user if already
@@ -74,14 +76,6 @@ private IdpResponse initResponse(boolean isNewUser) {
     // TODO: We need to centralize the auth logic. ProviderSignInBase classes were originally
     // meant to only retrieve remote provider data.
     private FirebaseAuth getAuth() {
-        FirebaseApp app = FirebaseApp.getInstance(getArguments().appName);
-        return FirebaseAuth.getInstance(app);
-    }
-
-    @Override
-    public void startSignIn(@NonNull FirebaseAuth auth,
-                            @NonNull HelperActivityBase activity,
-                            @NonNull String providerId) {
-        startSignIn(activity);
+        return AuthUI.getInstance(getArguments().appName).getAuth();
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/EmailSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/EmailSignInHandler.java
index 74f549565..3fc02701b 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/EmailSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/EmailSignInHandler.java
@@ -3,6 +3,7 @@
 import android.app.Application;
 import android.content.Intent;
 
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.Resource;
@@ -11,6 +12,8 @@
 import com.firebase.ui.auth.ui.email.EmailActivity;
 import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
+import com.google.firebase.auth.EmailAuthCredential;
+import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
 
 import androidx.annotation.NonNull;
@@ -18,13 +21,15 @@
 import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class EmailSignInHandler extends ProviderSignInBase<Void> {
+public class EmailSignInHandler extends SingleProviderSignInHandler<Void> {
     public EmailSignInHandler(Application application) {
-        super(application);
+        super(application, EmailAuthProvider.PROVIDER_ID);
     }
 
     @Override
-    public void startSignIn(@NonNull HelperActivityBase activity) {
+    public void startSignIn(@NonNull FirebaseAuth auth,
+                            @NonNull HelperActivityBase activity,
+                            @NonNull String providerId) {
         activity.startActivityForResult(
                 EmailActivity.createIntent(activity, activity.getFlowParams()),
                 RequestCodes.EMAIL_FLOW);
@@ -43,11 +48,4 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
             }
         }
     }
-
-    @Override
-    public void startSignIn(@NonNull FirebaseAuth auth,
-                            @NonNull HelperActivityBase activity,
-                            @NonNull String providerId) {
-        startSignIn(activity);
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/FacebookSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/FacebookSignInHandler.java
index 9bc574785..6ca01defb 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/FacebookSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/FacebookSignInHandler.java
@@ -39,7 +39,7 @@
 import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class FacebookSignInHandler extends ProviderSignInBase<AuthUI.IdpConfig> {
+public class FacebookSignInHandler extends SingleProviderSignInHandler<AuthUI.IdpConfig> {
     private static final String EMAIL = "email";
     private static final String PUBLIC_PROFILE = "public_profile";
 
@@ -49,7 +49,7 @@ public class FacebookSignInHandler extends ProviderSignInBase<AuthUI.IdpConfig>
     private final CallbackManager mCallbackManager = CallbackManager.Factory.create();
 
     public FacebookSignInHandler(Application application) {
-        super(application);
+        super(application, FacebookAuthProvider.PROVIDER_ID);
     }
 
     private static IdpResponse createIdpResponse(
@@ -80,7 +80,9 @@ protected void onCreate() {
     }
 
     @Override
-    public void startSignIn(@NonNull HelperActivityBase activity) {
+    public void startSignIn(@NonNull FirebaseAuth auth,
+                            @NonNull HelperActivityBase activity,
+                            @NonNull String providerId) {
         WebDialog.setWebDialogTheme(activity.getFlowParams().themeId);
         LoginManager.getInstance().logInWithReadPermissions(activity, mPermissions);
     }
@@ -162,11 +164,4 @@ public void onCompleted(JSONObject object, GraphResponse response) {
             setResult(Resource.forSuccess(createIdpResponse(mResult, email, name, photoUri)));
         }
     }
-
-    @Override
-    public void startSignIn(@NonNull FirebaseAuth auth,
-                            @NonNull HelperActivityBase activity,
-                            @NonNull String providerId) {
-        startSignIn(activity);
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpAnonymousUpgradeLinkingHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpAnonymousUpgradeLinkingHandler.java
index 58f798fcb..9222dd992 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpAnonymousUpgradeLinkingHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpAnonymousUpgradeLinkingHandler.java
@@ -5,6 +5,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.Resource;
@@ -12,7 +13,6 @@
 import com.firebase.ui.auth.util.data.AuthOperationManager;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.OAuthCredential;
@@ -25,16 +25,6 @@ public GenericIdpAnonymousUpgradeLinkingHandler(Application application) {
         super(application);
     }
 
-    @Override
-    public void startSignIn(@NonNull HelperActivityBase activity) {
-        setResult(Resource.<IdpResponse>forLoading());
-
-        FlowParameters flowParameters = activity.getFlowParams();
-
-        startSignIn(FirebaseAuth.getInstance(FirebaseApp.getInstance(flowParameters.appName)),
-                activity, getArguments().getProviderId());
-    }
-
     @Override
     public void startSignIn(@NonNull FirebaseAuth auth,
                             @NonNull HelperActivityBase activity,
@@ -42,10 +32,10 @@ public void startSignIn(@NonNull FirebaseAuth auth,
         setResult(Resource.<IdpResponse>forLoading());
 
         FlowParameters flowParameters = activity.getFlowParams();
-        OAuthProvider provider = buildOAuthProvider(providerId);
+        OAuthProvider provider = buildOAuthProvider(providerId, auth);
         if (flowParameters != null
                 && AuthOperationManager.getInstance().canUpgradeAnonymous(auth, flowParameters)) {
-                handleAnonymousUpgradeLinkingFlow(activity, provider, flowParameters);
+            handleAnonymousUpgradeLinkingFlow(activity, provider, flowParameters);
             return;
         }
 
@@ -55,13 +45,16 @@ public void startSignIn(@NonNull FirebaseAuth auth,
     private void handleAnonymousUpgradeLinkingFlow(final HelperActivityBase activity,
                                                    final OAuthProvider provider,
                                                    final FlowParameters flowParameters) {
+        final boolean useEmulator = activity.getAuthUI().isUseEmulator();
         AuthOperationManager.getInstance().safeGenericIdpSignIn(activity, provider, flowParameters)
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                     @Override
                     public void onSuccess(AuthResult authResult) {
                         // Pass the credential so we can sign-in on the after the merge
                         // conflict is resolved.
-                        handleSuccess(provider.getProviderId(),
+                        handleSuccess(
+                                useEmulator,
+                                provider.getProviderId(),
                                 authResult.getUser(), (OAuthCredential) authResult.getCredential(),
                                 /* setPendingCredential= */true);
                     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpSignInHandler.java
index 2ec366004..fecfa8d18 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/GenericIdpSignInHandler.java
@@ -5,6 +5,7 @@
 import com.firebase.ui.auth.FirebaseUiException;
 import com.firebase.ui.auth.FirebaseUiUserCollisionException;
 import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
 
 import android.app.Application;
@@ -29,13 +30,14 @@
 import com.firebase.ui.auth.viewmodel.RequestCodes;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthException;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.OAuthCredential;
 import com.google.firebase.auth.OAuthProvider;
 
@@ -49,14 +51,28 @@ public GenericIdpSignInHandler(Application application) {
         super(application);
     }
 
-    @Override
-    public void startSignIn(@NonNull HelperActivityBase activity) {
-        setResult(Resource.<IdpResponse>forLoading());
+    @NonNull
+    public static AuthUI.IdpConfig getGenericGoogleConfig() {
+        return new AuthUI.IdpConfig.GenericOAuthProviderBuilder(
+                GoogleAuthProvider.PROVIDER_ID,
+                "Google",
+                R.layout.fui_idp_button_google
+        ).build();
+    }
 
-        FlowParameters flowParameters = activity.getFlowParams();
+    @NonNull
+    public static AuthUI.IdpConfig getGenericFacebookConfig() {
+        return new AuthUI.IdpConfig.GenericOAuthProviderBuilder(
+                FacebookAuthProvider.PROVIDER_ID,
+                "Facebook",
+                R.layout.fui_idp_button_facebook
+        ).build();
+    }
 
-        startSignIn(FirebaseAuth.getInstance(FirebaseApp.getInstance(flowParameters.appName)),
-                activity, getArguments().getProviderId());
+    @Override
+    public final void startSignIn(@NonNull HelperActivityBase activity) {
+        setResult(Resource.<IdpResponse>forLoading());
+        startSignIn(activity.getAuth(), activity, getArguments().getProviderId());
     }
 
     @Override
@@ -66,7 +82,7 @@ public void startSignIn(@NonNull FirebaseAuth auth,
         setResult(Resource.<IdpResponse>forLoading());
 
         FlowParameters flowParameters = activity.getFlowParams();
-        OAuthProvider provider = buildOAuthProvider(providerId);
+        OAuthProvider provider = buildOAuthProvider(providerId, auth);
         if (flowParameters != null
                 && AuthOperationManager.getInstance().canUpgradeAnonymous(auth, flowParameters)) {
             handleAnonymousUpgradeFlow(auth, activity, provider, flowParameters);
@@ -79,12 +95,15 @@ public void startSignIn(@NonNull FirebaseAuth auth,
     protected void handleNormalSignInFlow(final FirebaseAuth auth,
                                           final HelperActivityBase activity,
                                           final OAuthProvider provider) {
+        final boolean useEmulator = activity.getAuthUI().isUseEmulator();
         auth.startActivityForSignInWithProvider(activity, provider)
                 .addOnSuccessListener(
                         new OnSuccessListener<AuthResult>() {
                             @Override
                             public void onSuccess(@NonNull AuthResult authResult) {
-                                handleSuccess(provider.getProviderId(),
+                                handleSuccess(
+                                        useEmulator,
+                                        provider.getProviderId(),
                                         authResult.getUser(),
                                         (OAuthCredential) authResult.getCredential(),
                                         authResult.getAdditionalUserInfo().isNewUser());
@@ -128,13 +147,16 @@ private void handleAnonymousUpgradeFlow(final FirebaseAuth auth,
                                             final HelperActivityBase activity,
                                             final OAuthProvider provider,
                                             final FlowParameters flowParameters) {
+        final boolean useEmulator = activity.getAuthUI().isUseEmulator();
         auth.getCurrentUser()
                 .startActivityForLinkWithProvider(activity, provider)
                 .addOnSuccessListener(
                         new OnSuccessListener<AuthResult>() {
                             @Override
                             public void onSuccess(@NonNull AuthResult authResult) {
-                                handleSuccess(provider.getProviderId(),
+                                handleSuccess(
+                                        useEmulator,
+                                        provider.getProviderId(),
                                         authResult.getUser(),
                                         (OAuthCredential) authResult.getCredential(),
                                         authResult.getAdditionalUserInfo().isNewUser());
@@ -196,9 +218,9 @@ public void onSuccess(List<String> providers) {
                         });
     }
 
-    protected OAuthProvider buildOAuthProvider(String providerId) {
+    public OAuthProvider buildOAuthProvider(String providerId, FirebaseAuth auth) {
         OAuthProvider.Builder providerBuilder =
-                OAuthProvider.newBuilder(providerId);
+                OAuthProvider.newBuilder(providerId, auth);
 
         List<String> scopes =
                 getArguments().getParams().getStringArrayList(ExtraConstants.GENERIC_OAUTH_SCOPES);
@@ -219,19 +241,32 @@ protected OAuthProvider buildOAuthProvider(String providerId) {
         return providerBuilder.build();
     }
 
-    protected void handleSuccess(@NonNull String providerId,
+    protected void handleSuccess(boolean isUseEmulator,
+                                 @NonNull String providerId,
                                  @NonNull FirebaseUser user,
                                  @NonNull OAuthCredential credential,
                                  boolean isNewUser,
                                  boolean setPendingCredential) {
+
+        String accessToken = credential.getAccessToken();
+        // noinspection ConstantConditions
+        if (accessToken == null && isUseEmulator) {
+            accessToken = "fake_access_token";
+        }
+
+        String secret = credential.getSecret();
+        if (secret == null && isUseEmulator) {
+            secret = "fake_secret";
+        }
+
         IdpResponse.Builder response = new IdpResponse.Builder(
                 new User.Builder(
                         providerId, user.getEmail())
                         .setName(user.getDisplayName())
                         .setPhotoUri(user.getPhotoUrl())
                         .build())
-                .setToken(credential.getAccessToken())
-                .setSecret(credential.getSecret());
+                .setToken(accessToken)
+                .setSecret(secret);
 
         if (setPendingCredential) {
             response.setPendingCredential(credential);
@@ -241,11 +276,12 @@ protected void handleSuccess(@NonNull String providerId,
         setResult(Resource.<IdpResponse>forSuccess(response.build()));
     }
 
-    protected void handleSuccess(@NonNull String providerId,
+    protected void handleSuccess(boolean isUseEmulator,
+                                 @NonNull String providerId,
                                  @NonNull FirebaseUser user,
                                  @NonNull OAuthCredential credential,
                                  boolean isNewUser) {
-        handleSuccess(providerId, user, credential, isNewUser, /* setPendingCredential= */true);
+        handleSuccess(isUseEmulator, providerId, user, credential, isNewUser, /* setPendingCredential= */true);
     }
 
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/GoogleSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/GoogleSignInHandler.java
index cff6c6c8e..a992ac784 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/GoogleSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/GoogleSignInHandler.java
@@ -31,14 +31,14 @@
 import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class GoogleSignInHandler extends ProviderSignInBase<GoogleSignInHandler.Params> {
+public class GoogleSignInHandler extends SingleProviderSignInHandler<GoogleSignInHandler.Params> {
     private static final String TAG = "GoogleSignInHandler";
 
     private AuthUI.IdpConfig mConfig;
     @Nullable private String mEmail;
 
     public GoogleSignInHandler(Application application) {
-        super(application);
+        super(application, GoogleAuthProvider.PROVIDER_ID);
     }
 
     private static IdpResponse createIdpResponse(GoogleSignInAccount account) {
@@ -59,7 +59,9 @@ protected void onCreate() {
     }
 
     @Override
-    public void startSignIn(@NonNull HelperActivityBase activity) {
+    public void startSignIn(@NonNull FirebaseAuth auth,
+                            @NonNull HelperActivityBase activity,
+                            @NonNull String providerId) {
         start();
     }
 
@@ -127,11 +129,4 @@ public Params(AuthUI.IdpConfig config, @Nullable String email) {
             this.email = email;
         }
     }
-
-    @Override
-    public void startSignIn(@NonNull FirebaseAuth auth,
-                            @NonNull HelperActivityBase activity,
-                            @NonNull String providerId) {
-        startSignIn(activity);
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/PhoneSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/PhoneSignInHandler.java
index 32d16b669..d8cac81e7 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/PhoneSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/PhoneSignInHandler.java
@@ -12,19 +12,22 @@
 import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
 import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.PhoneAuthProvider;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class PhoneSignInHandler extends ProviderSignInBase<AuthUI.IdpConfig> {
+public class PhoneSignInHandler extends SingleProviderSignInHandler<AuthUI.IdpConfig> {
     public PhoneSignInHandler(Application application) {
-        super(application);
+        super(application, PhoneAuthProvider.PROVIDER_ID);
     }
 
     @Override
-    public void startSignIn(@NonNull HelperActivityBase activity) {
+    public void startSignIn(@NonNull FirebaseAuth auth,
+                            @NonNull HelperActivityBase activity,
+                            @NonNull String providerId) {
         activity.startActivityForResult(
                 PhoneActivity.createIntent(
                         activity, activity.getFlowParams(), getArguments().getParams()),
@@ -42,11 +45,4 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
             }
         }
     }
-
-    @Override
-    public void startSignIn(@NonNull FirebaseAuth auth,
-                            @NonNull HelperActivityBase activity,
-                            @NonNull String providerId) {
-        startSignIn(activity);
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/SingleProviderSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/SingleProviderSignInHandler.java
new file mode 100644
index 000000000..502b7bbee
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/SingleProviderSignInHandler.java
@@ -0,0 +1,25 @@
+package com.firebase.ui.auth.data.remote;
+
+import android.app.Application;
+
+import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public abstract class SingleProviderSignInHandler<T> extends ProviderSignInBase<T> {
+
+    private final String mProviderId;
+
+    protected SingleProviderSignInHandler(Application application, String providerId) {
+        super(application);
+        this.mProviderId = providerId;
+    }
+
+    @Override
+    public final void startSignIn(@NonNull HelperActivityBase activity) {
+        this.startSignIn(activity.getAuth(), activity, mProviderId);
+    }
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
index 87f70d3b7..a21918638 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
@@ -15,6 +15,7 @@
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
 import com.google.android.gms.auth.api.credentials.Credential;
+import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 
 import androidx.annotation.NonNull;
@@ -58,6 +59,14 @@ public FlowParameters getFlowParams() {
         return mParams;
     }
 
+    public AuthUI getAuthUI() {
+        return AuthUI.getInstance(getFlowParams().appName);
+    }
+
+    public FirebaseAuth getAuth() {
+        return getAuthUI().getAuth();
+    }
+
     public void finish(int resultCode, @Nullable Intent intent) {
         setResult(resultCode, intent);
         finish();
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
index c55c573c7..28a554ee4 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -48,10 +48,8 @@
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.firebase.ui.auth.viewmodel.idp.SocialProviderResponseHandler;
 import com.google.android.material.snackbar.Snackbar;
-import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FacebookAuthProvider;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.PhoneAuthProvider;
 
@@ -274,46 +272,40 @@ private void handleSignInOperation(final IdpConfig idpConfig, View view) {
         final String providerId = idpConfig.getProviderId();
         final ProviderSignInBase<?> provider;
 
-        switch (providerId) {
-            case GoogleAuthProvider.PROVIDER_ID:
-                GoogleSignInHandler google = supplier.get(GoogleSignInHandler.class);
-                google.init(new GoogleSignInHandler.Params(idpConfig));
-                provider = google;
-
-                break;
-            case FacebookAuthProvider.PROVIDER_ID:
-                FacebookSignInHandler facebook = supplier.get(FacebookSignInHandler.class);
-                facebook.init(idpConfig);
-                provider = facebook;
+        AuthUI authUI = getAuthUI();
 
-                break;
+        switch (providerId) {
             case EMAIL_LINK_PROVIDER:
             case EmailAuthProvider.PROVIDER_ID:
-                EmailSignInHandler email = supplier.get(EmailSignInHandler.class);
-                email.init(null);
-                provider = email;
-
+                provider = supplier.get(EmailSignInHandler.class).initWith(null);
                 break;
             case PhoneAuthProvider.PROVIDER_ID:
-                PhoneSignInHandler phone = supplier.get(PhoneSignInHandler.class);
-                phone.init(idpConfig);
-                provider = phone;
-
+                provider = supplier.get(PhoneSignInHandler.class).initWith(idpConfig);
                 break;
             case AuthUI.ANONYMOUS_PROVIDER:
-                AnonymousSignInHandler anonymous = supplier.get(AnonymousSignInHandler.class);
-                anonymous.init(getFlowParams());
-                provider = anonymous;
-
+                provider = supplier.get(AnonymousSignInHandler.class).initWith(getFlowParams());
+                break;
+            case GoogleAuthProvider.PROVIDER_ID:
+                if (authUI.isUseEmulator()) {
+                    provider = supplier.get(GenericIdpSignInHandler.class)
+                            .initWith(GenericIdpSignInHandler.getGenericGoogleConfig());
+                } else {
+                    provider = supplier.get(GoogleSignInHandler.class).initWith(
+                            new GoogleSignInHandler.Params(idpConfig));
+                }
+                break;
+            case FacebookAuthProvider.PROVIDER_ID:
+                if (authUI.isUseEmulator()) {
+                    provider = supplier.get(GenericIdpSignInHandler.class)
+                            .initWith(GenericIdpSignInHandler.getGenericFacebookConfig());
+                } else {
+                    provider = supplier.get(FacebookSignInHandler.class).initWith(idpConfig);
+                }
                 break;
             default:
                 if (!TextUtils.isEmpty(
                         idpConfig.getParams().getString(GENERIC_OAUTH_PROVIDER_ID))) {
-                    GenericIdpSignInHandler genericIdp =
-                            supplier.get(GenericIdpSignInHandler.class);
-                    genericIdp.init(idpConfig);
-                    provider = genericIdp;
-
+                    provider = supplier.get(GenericIdpSignInHandler.class).initWith(idpConfig);
                     break;
                 }
                 throw new IllegalStateException("Unknown provider: " + providerId);
@@ -338,11 +330,16 @@ protected void onFailure(@NonNull Exception e) {
             }
 
             private void handleResponse(@NonNull IdpResponse response) {
+                // If we're using the emulator then the social flows actually use Generic IDP
+                // instead which means we shouldn't use the social response handler.
+                boolean isSocialResponse = AuthUI.SOCIAL_PROVIDERS.contains(providerId)
+                        && !getAuthUI().isUseEmulator();
+
                 if (!response.isSuccessful()) {
                     // We have no idea what provider this error stemmed from so just forward
                     // this along to the handler.
                     mHandler.startSignIn(response);
-                } else if (AuthUI.SOCIAL_PROVIDERS.contains(providerId)) {
+                } else if (isSocialResponse) {
                     // Don't use the response's provider since it can be different than the one
                     // that launched the sign-in attempt. Ex: the email flow is started, but
                     // ends up turning into a Google sign-in because that account already
@@ -350,9 +347,9 @@ private void handleResponse(@NonNull IdpResponse response) {
                     // started.
                     mHandler.startSignIn(response);
                 } else {
-                    // Email or phone: the credentials should have already been saved so
-                    // simply move along. Anononymous sign in also does not require any
-                    // other operations.
+                    // Email, phone, or generic: the credentials should have already been saved so
+                    // simply move along.
+                    // Anononymous sign in also does not require any other operations.
                     finish(response.isSuccessful() ? RESULT_OK : RESULT_CANCELED,
                             response.toIntent());
                 }
@@ -366,9 +363,7 @@ public void onClick(View view) {
                     return;
                 }
 
-                FirebaseAuth auth = FirebaseAuth.getInstance(
-                        FirebaseApp.getInstance(getFlowParams().appName));
-                provider.startSignIn(auth, AuthMethodPickerActivity.this,
+                provider.startSignIn(getAuth(), AuthMethodPickerActivity.this,
                         idpConfig.getProviderId());
             }
         });
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/SingleSignInActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/SingleSignInActivity.java
index c6604a567..17221f7ed 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/SingleSignInActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/SingleSignInActivity.java
@@ -21,9 +21,7 @@
 import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.firebase.ui.auth.viewmodel.idp.SocialProviderResponseHandler;
-import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.FacebookAuthProvider;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.GoogleAuthProvider;
 
 import androidx.annotation.NonNull;
@@ -63,25 +61,30 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mHandler = supplier.get(SocialProviderResponseHandler.class);
         mHandler.init(getFlowParams());
 
+        boolean useEmulator = getAuthUI().isUseEmulator();
+
         switch (provider) {
             case GoogleAuthProvider.PROVIDER_ID:
-                GoogleSignInHandler google = supplier.get(GoogleSignInHandler.class);
-                google.init(new GoogleSignInHandler.Params(providerConfig, user.getEmail()));
-                mProvider = google;
+                if (useEmulator) {
+                    mProvider = supplier.get(GenericIdpSignInHandler.class)
+                            .initWith(GenericIdpSignInHandler.getGenericGoogleConfig());
+                } else {
+                    mProvider = supplier.get(GoogleSignInHandler.class).initWith(
+                            new GoogleSignInHandler.Params(providerConfig, user.getEmail()));
+                }
                 break;
             case FacebookAuthProvider.PROVIDER_ID:
-                FacebookSignInHandler facebook = supplier.get(FacebookSignInHandler.class);
-                facebook.init(providerConfig);
-                mProvider = facebook;
+                if (useEmulator) {
+                    mProvider = supplier.get(GenericIdpSignInHandler.class)
+                            .initWith(GenericIdpSignInHandler.getGenericFacebookConfig());
+                } else {
+                    mProvider = supplier.get(FacebookSignInHandler.class).initWith(providerConfig);
+                }
                 break;
             default:
                 if (!TextUtils.isEmpty(
                         providerConfig.getParams().getString(GENERIC_OAUTH_PROVIDER_ID))) {
-                    GenericIdpSignInHandler genericIdp =
-                            supplier.get(GenericIdpSignInHandler.class);
-                    genericIdp.init(providerConfig);
-                    mProvider = genericIdp;
-
+                    mProvider = supplier.get(GenericIdpSignInHandler.class).initWith(providerConfig);
                     break;
                 }
                 throw new IllegalStateException("Invalid provider id: " + provider);
@@ -90,7 +93,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mProvider.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
             @Override
             protected void onSuccess(@NonNull IdpResponse response) {
-                if (AuthUI.SOCIAL_PROVIDERS.contains(provider) || !response.isSuccessful()) {
+                boolean useSocialHandler = AuthUI.SOCIAL_PROVIDERS.contains(provider)
+                        && !getAuthUI().isUseEmulator();
+
+                if (useSocialHandler || !response.isSuccessful()) {
                     mHandler.startSignIn(response);
                     return;
                 }
@@ -127,10 +133,7 @@ protected void onFailure(@NonNull Exception e) {
         });
 
         if (mHandler.getOperation().getValue() == null) {
-            FirebaseAuth auth = FirebaseAuth.getInstance(
-                    FirebaseApp.getInstance(getFlowParams().appName));
-            mProvider.startSignIn(auth,
-                    this, provider);
+            mProvider.startSignIn(getAuth(), this, provider);
         }
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java
index 7e587885e..1da1ba20d 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java
@@ -33,6 +33,7 @@
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.data.remote.FacebookSignInHandler;
 import com.firebase.ui.auth.data.remote.GenericIdpAnonymousUpgradeLinkingHandler;
+import com.firebase.ui.auth.data.remote.GenericIdpSignInHandler;
 import com.firebase.ui.auth.data.remote.GoogleSignInHandler;
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.util.ExtraConstants;
@@ -41,9 +42,8 @@
 import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.firebase.ui.auth.viewmodel.idp.LinkingSocialProviderResponseHandler;
-import com.google.firebase.FirebaseApp;
+import com.google.android.gms.auth.api.Auth;
 import com.google.firebase.auth.FacebookAuthProvider;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.GoogleAuthProvider;
 
 import android.text.TextUtils;
@@ -59,6 +59,7 @@ public class WelcomeBackIdpPrompt extends AppCompatBase {
 
     private Button mDoneButton;
     private ProgressBar mProgressBar;
+    private TextView mPromptText;
 
     public static Intent createIntent(
             Context context, FlowParameters flowParams, User existingUser) {
@@ -82,6 +83,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         mDoneButton = findViewById(R.id.welcome_back_idp_button);
         mProgressBar = findViewById(R.id.top_progress_bar);
+        mPromptText = findViewById(R.id.welcome_back_idp_prompt);
 
         User existingUser = User.getUser(getIntent());
         IdpResponse requestedUserResponse = IdpResponse.fromResultIntent(getIntent());
@@ -114,32 +116,34 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         String genericOAuthProviderId = config.getParams()
                 .getString(ExtraConstants.GENERIC_OAUTH_PROVIDER_ID);
 
+        boolean useEmulator = getAuthUI().isUseEmulator();
+
         switch (providerId) {
             case GoogleAuthProvider.PROVIDER_ID:
-                GoogleSignInHandler google = supplier.get(GoogleSignInHandler.class);
-                google.init(new GoogleSignInHandler.Params(config, existingUser.getEmail()));
-                mProvider = google;
-
+                if (useEmulator) {
+                    mProvider = supplier.get(GenericIdpAnonymousUpgradeLinkingHandler.class)
+                            .initWith(GenericIdpSignInHandler.getGenericGoogleConfig());
+                } else {
+                    mProvider = supplier.get(GoogleSignInHandler.class).initWith(
+                            new GoogleSignInHandler.Params(config, existingUser.getEmail()));
+                }
                 providerName = getString(R.string.fui_idp_name_google);
                 break;
             case FacebookAuthProvider.PROVIDER_ID:
-                FacebookSignInHandler facebook = supplier.get(FacebookSignInHandler.class);
-                facebook.init(config);
-                mProvider = facebook;
-
+                if (useEmulator) {
+                    mProvider = supplier.get(GenericIdpAnonymousUpgradeLinkingHandler.class)
+                            .initWith(GenericIdpSignInHandler.getGenericFacebookConfig());
+                } else {
+                    mProvider = supplier.get(FacebookSignInHandler.class).initWith(config);
+                }
                 providerName = getString(R.string.fui_idp_name_facebook);
                 break;
             default:
                 if (TextUtils.equals(providerId, genericOAuthProviderId)) {
-                    String genericOAuthProviderName = config.getParams()
+                    mProvider = supplier.get(GenericIdpAnonymousUpgradeLinkingHandler.class)
+                            .initWith(config);
+                    providerName = config.getParams()
                             .getString(ExtraConstants.GENERIC_OAUTH_PROVIDER_NAME);
-
-                    GenericIdpAnonymousUpgradeLinkingHandler genericIdp
-                            = supplier.get(GenericIdpAnonymousUpgradeLinkingHandler.class);
-                    genericIdp.init(config);
-                    mProvider = genericIdp;
-
-                    providerName = genericOAuthProviderName;
                 } else {
                     throw new IllegalStateException("Invalid provider id: " + providerId);
                 }
@@ -148,7 +152,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mProvider.getOperation().observe(this, new ResourceObserver<IdpResponse>(this) {
             @Override
             protected void onSuccess(@NonNull IdpResponse response) {
-                if (!AuthUI.SOCIAL_PROVIDERS.contains(response.getProviderType())
+                boolean isGenericIdp = getAuthUI().isUseEmulator()
+                        || !AuthUI.SOCIAL_PROVIDERS.contains(response.getProviderType());
+
+                if (isGenericIdp
                         && !response.hasCredentialForLinking()
                         && !handler.hasCredentialForLinking()) {
                     // Generic Idp does not return a credential - if this is not a linking flow,
@@ -165,7 +172,7 @@ protected void onFailure(@NonNull Exception e) {
             }
         });
 
-        ((TextView) findViewById(R.id.welcome_back_idp_prompt)).setText(getString(
+        mPromptText.setText(getString(
                 R.string.fui_welcome_back_idp_prompt,
                 existingUser.getEmail(),
                 providerName));
@@ -173,10 +180,7 @@ protected void onFailure(@NonNull Exception e) {
         mDoneButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
-                FirebaseAuth auth = FirebaseAuth.getInstance(
-                        FirebaseApp.getInstance(getFlowParams().appName));
-                mProvider.startSignIn(auth,
-                        WelcomeBackIdpPrompt.this, providerId);
+                mProvider.startSignIn(getAuth(), WelcomeBackIdpPrompt.this, providerId);
             }
         });
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/data/AuthOperationManager.java b/auth/src/main/java/com/firebase/ui/auth/util/data/AuthOperationManager.java
index 840c7c53c..97fcb2ece 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/data/AuthOperationManager.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/data/AuthOperationManager.java
@@ -1,5 +1,6 @@
 package com.firebase.ui.auth.util.data;
 
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.google.android.gms.tasks.Continuation;
@@ -50,8 +51,12 @@ private FirebaseAuth getScratchAuth(FlowParameters flowParameters) {
         // Use a different FirebaseApp so that the anonymous user state is not lost in our
         // original FirebaseAuth instance.
         if (mScratchAuth == null) {
-            FirebaseApp app = FirebaseApp.getInstance(flowParameters.appName);
-            mScratchAuth = FirebaseAuth.getInstance(getScratchApp(app));
+            AuthUI authUI = AuthUI.getInstance(flowParameters.appName);
+            mScratchAuth = FirebaseAuth.getInstance(getScratchApp(authUI.getApp()));
+
+            if (authUI.isUseEmulator()) {
+                mScratchAuth.useEmulator(authUI.getEmulatorHost(), authUI.getEmulatorPort());
+            }
         }
         return mScratchAuth;
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java
index 8169e5781..772e64920 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java
@@ -2,6 +2,7 @@
 
 import android.app.Application;
 
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.util.GoogleApiUtils;
@@ -27,6 +28,7 @@ protected AuthViewModelBase(Application application) {
     protected void onCreate() {
         FirebaseApp app = FirebaseApp.getInstance(getArguments().appName);
         mAuth = FirebaseAuth.getInstance(app);
+
         mCredentialsClient = GoogleApiUtils.getCredentialsClient(getApplication());
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/ProviderSignInBase.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/ProviderSignInBase.java
index a9ae7dc20..96eec88f2 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/ProviderSignInBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/ProviderSignInBase.java
@@ -3,11 +3,13 @@
 import android.app.Application;
 import android.content.Intent;
 
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.google.firebase.auth.FirebaseAuth;
 
+import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
@@ -17,6 +19,7 @@
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public abstract class ProviderSignInBase<T> extends OperableViewModel<T, Resource<IdpResponse>> {
+
     protected ProviderSignInBase(Application application) {
         super(application);
     }
@@ -42,4 +45,12 @@ public abstract void startSignIn(@NonNull FirebaseAuth auth,
                                      @NonNull String providerId);
 
     public abstract void onActivityResult(int requestCode, int resultCode, @Nullable Intent data);
+
+    /**
+     * Just a convenience method that makes certain chaining logic easier.
+     */
+    public ProviderSignInBase<T> initWith(T args) {
+        super.init(args);
+        return this;
+    }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
index 44888d720..c2ed71f74 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
@@ -23,6 +23,7 @@
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.auth.ActionCodeSettings;
@@ -82,7 +83,9 @@ private static void spyContextAndResources() {
     }
 
     private static void initializeApp(Context context) {
-        if (!FirebaseApp.getApps(context).isEmpty()) return;
+        if (!FirebaseApp.getApps(context).isEmpty()) {
+            return;
+        }
 
         FirebaseApp.initializeApp(context, new FirebaseOptions.Builder()
                 .setApiKey("fake")
@@ -106,6 +109,17 @@ public static FirebaseUser getMockFirebaseUser() {
         return user;
     }
 
+    public static HelperActivityBase getHelperActivity(FlowParameters parameters) {
+        AuthUI authUI = AuthUI.getInstance(parameters.appName);
+
+        HelperActivityBase activity = mock(HelperActivityBase.class);
+        when(activity.getFlowParams()).thenReturn(parameters);
+        when(activity.getAuthUI()).thenReturn(authUI);
+        when(activity.getAuth()).thenReturn(authUI.getAuth());
+
+        return activity;
+    }
+
     public static FlowParameters getFlowParameters(Collection<String> providerIds) {
         return getFlowParameters(providerIds, false);
     }
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
index 54f85d1fc..3cef98399 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
@@ -43,6 +43,7 @@
 import androidx.test.core.app.ApplicationProvider;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
 
 @RunWith(RobolectricTestRunner.class)
 public class AuthMethodPickerActivityTest {
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/AnonymousSignInHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/AnonymousSignInHandlerTest.java
index c50fadeb8..d693eae66 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/AnonymousSignInHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/AnonymousSignInHandlerTest.java
@@ -11,6 +11,7 @@
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
 import com.firebase.ui.auth.testhelpers.ResourceMatchers;
 import com.firebase.ui.auth.testhelpers.TestHelper;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 
@@ -40,18 +41,25 @@
 @RunWith(RobolectricTestRunner.class)
 public class AnonymousSignInHandlerTest {
 
-    @Mock FirebaseAuth mMockAuth;
-    AnonymousSignInHandler mHandler;
+    @Mock
+    FirebaseAuth mMockAuth;
+
+    HelperActivityBase mMockActivity;
 
-    @Mock Observer<Resource<IdpResponse>> mResponseObserver;
+    @Mock
+    Observer<Resource<IdpResponse>> mResponseObserver;
+
+    AnonymousSignInHandler mHandler;
 
     @Before
     public void setUp() {
         TestHelper.initialize();
         MockitoAnnotations.initMocks(this);
 
-        mHandler = new AnonymousSignInHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(new ArrayList<String>());
+        mMockActivity = TestHelper.getHelperActivity(testParams);
+
+        mHandler = new AnonymousSignInHandler((Application) ApplicationProvider.getApplicationContext());
         mHandler.init(testParams);
         mHandler.mAuth = mMockAuth;
     }
@@ -63,7 +71,7 @@ public void testStartSignIn_expectSuccess() {
         when(mMockAuth.signInAnonymously())
                 .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
 
-        mHandler.startSignIn(null);
+        mHandler.startSignIn(mMockActivity);
 
         verify(mMockAuth).signInAnonymously();
 
@@ -86,7 +94,7 @@ public void testStartSignIn_expectFailure() {
         when(mMockAuth.signInAnonymously())
                 .thenReturn(AutoCompleteTask.<AuthResult>forFailure(new Exception("FAILED")));
 
-        mHandler.startSignIn(null);
+        mHandler.startSignIn(mMockActivity);
 
         verify(mMockAuth).signInAnonymously();
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpAnonymousUpgradeLinkingHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpAnonymousUpgradeLinkingHandlerTest.java
index 13df21ddf..cf350a831 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpAnonymousUpgradeLinkingHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpAnonymousUpgradeLinkingHandlerTest.java
@@ -15,9 +15,9 @@
 import com.firebase.ui.auth.testhelpers.ResourceMatchers;
 import com.firebase.ui.auth.testhelpers.TestHelper;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.ui.idp.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.util.data.AuthOperationManager;
 import com.firebase.ui.auth.viewmodel.email.EmailLinkSignInHandler;
+import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
@@ -40,9 +40,13 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -61,6 +65,7 @@ public class GenericIdpAnonymousUpgradeLinkingHandlerTest {
     private static final String CUSTOM_PARAMETER_VALUE = "customParameterValue";
 
     private GenericIdpAnonymousUpgradeLinkingHandler mHandler;
+    private HelperActivityBase mMockActivity;
 
     @Mock
     private FirebaseAuth mMockAuth;
@@ -70,12 +75,6 @@ public class GenericIdpAnonymousUpgradeLinkingHandlerTest {
     @Mock
     private FirebaseAuth mScratchMockAuth;
 
-    @Mock
-    private HelperActivityBase mMockActivity;
-
-    @Mock
-    private WelcomeBackIdpPrompt mMockWelcomeBackIdpPrompt;
-
     @Mock
     private Observer<Resource<IdpResponse>> mResponseObserver;
 
@@ -91,11 +90,10 @@ public void setUp() {
                 = TestHelper.getFlowParameters(
                 Arrays.asList(MICROSOFT_PROVIDER, GoogleAuthProvider.PROVIDER_ID),
                 /* enableAnonymousUpgrade= */ true);
-        when(mMockActivity.getFlowParams()).thenReturn(testParams);
-        when(mMockWelcomeBackIdpPrompt.getFlowParams()).thenReturn(testParams);
+        mMockActivity = TestHelper.getHelperActivity(testParams);
 
-        mHandler = new GenericIdpAnonymousUpgradeLinkingHandler(
-                (Application) ApplicationProvider.getApplicationContext());
+        mHandler = spy(new GenericIdpAnonymousUpgradeLinkingHandler(
+                (Application) ApplicationProvider.getApplicationContext()));
 
         Map<String, String> customParams = new HashMap<>();
         customParams.put(CUSTOM_PARAMETER_KEY, CUSTOM_PARAMETER_VALUE);
@@ -112,6 +110,7 @@ public void setUp() {
     @Test
     public void testStartSignIn_anonymousUpgradeLinkingFlow_expectIdpResponseWithCredential() {
         setupAnonymousUpgrade();
+
         AuthOperationManager authOperationManager = AuthOperationManager.getInstance();
         authOperationManager.mScratchAuth = mScratchMockAuth;
 
@@ -128,10 +127,11 @@ public void testStartSignIn_anonymousUpgradeLinkingFlow_expectIdpResponseWithCre
         when(mMockUser.getDisplayName()).thenReturn(DISPLAY_NAME);
         when(mMockUser.getPhotoUrl()).thenReturn(new Uri.Builder().build());
 
-        mHandler.startSignIn(mMockAuth, mMockWelcomeBackIdpPrompt, MICROSOFT_PROVIDER);
+        mockOAuthProvider(MICROSOFT_PROVIDER);
+        mHandler.startSignIn(mMockAuth, mMockActivity, MICROSOFT_PROVIDER);
 
         ArgumentCaptor<OAuthProvider> providerCaptor = ArgumentCaptor.forClass(OAuthProvider.class);
-        verify(mScratchMockAuth).startActivityForSignInWithProvider(eq(mMockWelcomeBackIdpPrompt),
+        verify(mScratchMockAuth).startActivityForSignInWithProvider(eq(mMockActivity),
                 providerCaptor.capture());
         assertThat(providerCaptor.getValue().getProviderId()).isEqualTo(MICROSOFT_PROVIDER);
 
@@ -152,4 +152,13 @@ private void setupAnonymousUpgrade() {
         when(mMockUser.isAnonymous()).thenReturn(true);
         when(mMockAuth.getCurrentUser()).thenReturn(mMockUser);
     }
+
+    private void mockOAuthProvider(String providerId) {
+        // TODO(samstern): I wish we did not have to do this but the OAuthProvider() builder
+        //                 throws a NPE and we can't fix it due to b/172544960
+        OAuthProvider mockProvider = mock(OAuthProvider.class);
+        when(mockProvider.getProviderId()).thenReturn(providerId);
+        doReturn(mockProvider).when(mHandler)
+                .buildOAuthProvider(anyString(), any(FirebaseAuth.class));
+    }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java
index 93a0ea53c..cd48c8921 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java
@@ -48,9 +48,13 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -69,15 +73,12 @@ public class GenericIdpSignInHandlerTest {
     private static final String SCOPE = "scope";
 
     private GenericIdpSignInHandler mHandler;
+    private HelperActivityBase mMockActivity;
 
     @Mock
     private FirebaseAuth mMockAuth;
     @Mock
     private FirebaseUser mMockUser;
-
-    @Mock
-    private HelperActivityBase mMockActivity;
-
     @Mock
     private Observer<Resource<IdpResponse>> mResponseObserver;
 
@@ -90,10 +91,10 @@ public void setUp() {
                 = TestHelper.getFlowParameters(
                 Arrays.asList(MICROSOFT_PROVIDER, GoogleAuthProvider.PROVIDER_ID),
                 /* enableAnonymousUpgrade= */ true);
-        when(mMockActivity.getFlowParams()).thenReturn(testParams);
+        mMockActivity = TestHelper.getHelperActivity(testParams);
 
-        mHandler = new GenericIdpSignInHandler(
-                (Application) ApplicationProvider.getApplicationContext());
+        mHandler = spy(new GenericIdpSignInHandler(
+                (Application) ApplicationProvider.getApplicationContext()));
 
         // See https://github.com/firebase/FirebaseUI-Android/issues/1805
         Map<String, String> customParams = new HashMap<>();
@@ -115,6 +116,7 @@ public void testStartSignIn_normalSignInFlow_expectSuccess() {
         when(mMockAuth.startActivityForSignInWithProvider(any(Activity.class), any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
 
+        mockOAuthProvider(MICROSOFT_PROVIDER);
         mHandler.startSignIn(mMockAuth, mMockActivity, MICROSOFT_PROVIDER);
 
         ArgumentCaptor<OAuthProvider> providerCaptor = ArgumentCaptor.forClass(OAuthProvider.class);
@@ -155,6 +157,7 @@ public void testStartSignIn_normalSignInFlowWithRecoverableError_expectFailure()
         when(mMockAuth.startActivityForSignInWithProvider(any(Activity.class), any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.<AuthResult>forFailure(collisionException));
 
+        mockOAuthProvider(MICROSOFT_PROVIDER);
         mHandler.startSignIn(mMockAuth, mMockActivity, MICROSOFT_PROVIDER);
 
         ArgumentCaptor<OAuthProvider> providerCaptor = ArgumentCaptor.forClass(OAuthProvider.class);
@@ -186,6 +189,7 @@ public void testStartSignIn_normalSignInFlowWithError_expectFailure() {
                 any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.<AuthResult>forFailure(firebaseAuthException));
 
+        mockOAuthProvider(MICROSOFT_PROVIDER);
         mHandler.startSignIn(mMockAuth, mMockActivity, MICROSOFT_PROVIDER);
 
         ArgumentCaptor<OAuthProvider> providerCaptor
@@ -216,7 +220,7 @@ public void testStartSignIn_anonymousUpgradeFlow_expectSuccess() {
                 any(Activity.class), any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
 
-
+        mockOAuthProvider(MICROSOFT_PROVIDER);
         mHandler.startSignIn(mMockAuth, mMockActivity, MICROSOFT_PROVIDER);
 
         ArgumentCaptor<OAuthProvider> providerCaptor
@@ -263,6 +267,7 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableEr
                         new FakeSignInMethodQueryResult(Arrays.asList(
                                 MICROSOFT_PROVIDER))));
 
+        mockOAuthProvider(MICROSOFT_PROVIDER);
         mHandler.startSignIn(mMockAuth, mMockActivity, MICROSOFT_PROVIDER);
 
         ArgumentCaptor<OAuthProvider> providerCaptor = ArgumentCaptor.forClass(OAuthProvider.class);
@@ -308,6 +313,7 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableLi
                         new FakeSignInMethodQueryResult(Arrays.asList(
                                 GoogleAuthProvider.PROVIDER_ID))));
 
+        mockOAuthProvider(MICROSOFT_PROVIDER);
         mHandler.startSignIn(mMockAuth, mMockActivity, MICROSOFT_PROVIDER);
 
         ArgumentCaptor<OAuthProvider> providerCaptor = ArgumentCaptor.forClass(OAuthProvider.class);
@@ -335,4 +341,13 @@ private void setupAnonymousUpgrade() {
         when(mMockUser.isAnonymous()).thenReturn(true);
         when(mMockAuth.getCurrentUser()).thenReturn(mMockUser);
     }
+
+    private void mockOAuthProvider(String providerId) {
+        // TODO(samstern): I wish we did not have to do this but the OAuthProvider() builder
+        //                 throws a NPE and we can't fix it due to b/172544960
+        OAuthProvider mockProvider = mock(OAuthProvider.class);
+        when(mockProvider.getProviderId()).thenReturn(providerId);
+        doReturn(mockProvider).when(mHandler)
+                .buildOAuthProvider(anyString(), any(FirebaseAuth.class));
+    }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
index ba37530d8..87c0301b8 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
@@ -65,8 +65,6 @@ public class LinkingSocialProviderResponseHandlerTest {
 
     @Mock FirebaseUser mMockUser;
     @Mock Observer<Resource<IdpResponse>> mResponseObserver;
-    @Mock
-    HelperActivityBase mMockActivity;
 
     private LinkingSocialProviderResponseHandler mHandler;
 

From 0b36775f0e4c702470523acc046fa40c02bfd8bf Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Wed, 11 Nov 2020 07:12:26 -0500
Subject: [PATCH 6/8] Docs for version 7.0 (#1863)

---
 auth/README.md                     | 20 ++++++++++++
 buildSrc/src/main/kotlin/Config.kt |  2 +-
 docs/upgrade-to-7.0.md             | 50 ++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 docs/upgrade-to-7.0.md

diff --git a/auth/README.md b/auth/README.md
index 4c3b0d57d..e0726302e 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -32,6 +32,7 @@ and [Web](https://github.com/firebase/firebaseui-web/).
 1. [Demo](#demo)
 1. [Configuration](#configuration)
    1. [Provider config](#identity-provider-configuration)
+   1. [Auth emulator config](#auth-emulator-configuration)
 1. [Usage instructions](#using-firebaseui-for-authentication)
    1. [AuthUI sign-in](#authui-sign-in)
    1. [Handling responses](#handling-the-sign-in-response)
@@ -150,6 +151,25 @@ Note: unlike other sign-in methods, signing in with these providers involves the
 You must enable the "Request email addresses from users" permission in the "Permissions" tab of your
 Twitter app.
 
+### Auth emulator configuration
+
+As of version `7.0.0` FirebaseUI is compatible with the Firebase Authentication emulator:
+https://firebase.google.com/docs/emulator-suite
+
+Use the `useEmulator` method to point an AuthUI instance at the emulator:
+
+```java
+AuthUI authUI = AuthUI.getInstance();
+
+// "10.0.2.2" is the special host value for contacting "localhost" from within
+// the Android Emulator
+authUI.useEmulator("10.0.2.2", 9099);
+```
+
+By default Android blocks connections to `http://` endpoints such as the Auth emulator.
+To allow your app to communicate with the Auth emulator, use a [network security configuration](https://developer.android.com/training/articles/security-config)
+or set `android:usesCleartextTraffic="true"` in `AndroidManifest.xml`.
+
 ## Using FirebaseUI for authentication
 
 Before invoking the FirebaseUI authentication flow, your app should check
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 0f8a383ec..a5ae34263 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -50,7 +50,7 @@ object Config {
         }
 
         object PlayServices {
-            const val auth = "com.google.android.gms:play-services-auth:18.0.0"
+            const val auth = "com.google.android.gms:play-services-auth:19.0.0"
         }
 
         object Provider {
diff --git a/docs/upgrade-to-7.0.md b/docs/upgrade-to-7.0.md
new file mode 100644
index 000000000..b45b26e7e
--- /dev/null
+++ b/docs/upgrade-to-7.0.md
@@ -0,0 +1,50 @@
+# Upgrading to FirebaseUI 7.0
+
+FirebaseUI version `7.0.0` has no breaking API changes from version `6.4.0` but updates
+critical dependencies to new major versions.
+
+Below is a comprehensive list of all of the relevant dependencies for each module of FirebaseUI.
+
+**Auth**
+
+```
+androidx.browser:browser:1.0.0
+androidx.cardview:cardview:1.0.0
+androidx.constraintlayout:constraintlayout:2.0.4 (breaking)
+androidx.lifecycle:lifecycle-extensions:2.2.0
+androidx.legacy:legacy-support-v4:1.0.0
+com.google.android.material:material:1.2.1
+com.google.android.gms:play-services-auth:19.0.0 (breaking)
+com.google.firebase:firebase-auth:20.0.0 (breaking)
+```
+
+**Common**
+
+```
+androidx.annotation:annotation:1.1.0
+androidx.lifecycle:lifecycle-runtime:2.2.0
+androidx.lifecycle:lifecycle-viewmodel:2.2.0
+```
+
+**Database**
+
+```
+androidx.legacy:legacy-support-v4:1.0.0
+androidx.recyclerview:recyclerview:1.1.0
+com.google.firebase:firebase-database:19.5.1
+```
+
+**Firestore**
+
+```
+androidx.legacy:legacy-support-v4:1.0.0
+androidx.recyclerview:recyclerview:1.1.0
+com.google.firebase:firebase-firestore:22.0.0 (breaking)
+```
+
+**Storage**
+
+```
+androidx.legacy:legacy-support-v4:1.0.0
+com.google.firebase:firebase-storage:19.2.0
+```

From a5947d749d8448d9d34c4043d98f77b117d9256e Mon Sep 17 00:00:00 2001
From: Sam <samstern@google.com>
Date: Wed, 11 Nov 2020 12:15:18 +0000
Subject: [PATCH 7/8] Version 7.0.0

---
 .opensource/project.json           | 3 ++-
 README.md                          | 9 +++++----
 auth/README.md                     | 4 ++--
 buildSrc/src/main/kotlin/Config.kt | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.opensource/project.json b/.opensource/project.json
index ae3264783..d76895a36 100644
--- a/.opensource/project.json
+++ b/.opensource/project.json
@@ -18,7 +18,8 @@
         "docs/upgrade-to-3.0.md": "Upgrade to v3.0",
         "docs/upgrade-to-4.0.md": "Upgrade to v4.0",
         "docs/upgrade-to-5.0.md": "Upgrade to v5.0",
-        "docs/upgrade-to-6.0.md": "Upgrade to v6.0"
+        "docs/upgrade-to-6.0.md": "Upgrade to v6.0",
+        "docs/upgrade-to-7.0.md": "Upgrade to v7.0"
     },
   
     "related": [
diff --git a/README.md b/README.md
index 6ef43566a..b1c93a9ef 100644
--- a/README.md
+++ b/README.md
@@ -48,16 +48,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    implementation 'com.firebaseui:firebase-ui-database:6.4.0'
+    implementation 'com.firebaseui:firebase-ui-database:7.0.0'
 
     // FirebaseUI for Cloud Firestore
-    implementation 'com.firebaseui:firebase-ui-firestore:6.4.0'
+    implementation 'com.firebaseui:firebase-ui-firestore:7.0.0'
 
     // FirebaseUI for Firebase Auth
-    implementation 'com.firebaseui:firebase-ui-auth:6.4.0'
+    implementation 'com.firebaseui:firebase-ui-auth:7.0.0'
 
     // FirebaseUI for Cloud Storage
-    implementation 'com.firebaseui:firebase-ui-storage:6.4.0'
+    implementation 'com.firebaseui:firebase-ui-storage:7.0.0'
 }
 ```
 
@@ -71,6 +71,7 @@ After the project is synchronized, we're ready to start using Firebase functiona
 If you are using an old version of FirebaseUI and upgrading, please see the appropriate
 migration guide:
 
+* [Upgrade from 6.4.0 to 7.x.x](./docs/upgrade-to-7.0.md)
 * [Upgrade from 5.1.0 to 6.x.x](./docs/upgrade-to-6.0.md)
 * [Upgrade from 4.3.2 to 5.x.x](./docs/upgrade-to-5.0.md)
 * [Upgrade from 3.3.1 to 4.x.x](./docs/upgrade-to-4.0.md)
diff --git a/auth/README.md b/auth/README.md
index e0726302e..46ece2a88 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -66,11 +66,11 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    implementation 'com.firebaseui:firebase-ui-auth:6.4.0'
+    implementation 'com.firebaseui:firebase-ui-auth:7.0.0'
 
     // Required only if Facebook login support is required
     // Find the latest Facebook SDK releases here: https://github.com/facebook/facebook-android-sdk/blob/master/CHANGELOG.md
-    implementation 'com.facebook.android:facebook-login:4.x'
+    implementation 'com.facebook.android:facebook-login:8.1.0'
 }
 ```
 
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index a5ae34263..cb19e71e5 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -1,5 +1,5 @@
 object Config {
-    const val version = "7.0.0-SNAPSHOT"
+    const val version = "7.0.0"
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
     private const val kotlinVersion = "1.3.72"

From 8468aaf536c81c9c3da2f06f86922033941e5608 Mon Sep 17 00:00:00 2001
From: Sam <samstern@google.com>
Date: Wed, 11 Nov 2020 12:17:58 +0000
Subject: [PATCH 8/8] Clear changelog after release

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd4e8a8a8..e69de29bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +0,0 @@
-- [All] Update all dependencies to latest major version.
-- [Auth] Remove SupportVectorDrawablesButton (#1860) (contributed by @AryanNajafi)
-- [Auth] Add `AuthUI#useEmulator()` method  to use FirebaseUI with the Firebase Auth Emulator (#1849)