From c8a890d83200b3d9a93037010ca1eeb4546c9bb4 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Thu, 10 Aug 2017 12:31:09 -0700
Subject: [PATCH 01/28] Add support for account linking

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../firebase/uidemo/auth/AuthUiActivity.java  |  12 +-
 .../uidemo/auth/SignedInActivity.java         |  33 ++-
 .../uidemo/database/ChatIndexActivity.java    |  12 +-
 app/src/main/res/layout/signed_in_layout.xml  |  41 +++-
 app/src/main/res/values/strings.xml           |   2 +
 auth/README.md                                |  90 +++++++++
 .../java/com/firebase/ui/auth/AuthUI.java     |  17 ++
 .../com/firebase/ui/auth/IdpResponse.java     |  14 ++
 .../main/java/com/firebase/ui/auth/User.java  |  37 +++-
 .../firebase/ui/auth/ui/FlowParameters.java   |  15 ++
 .../ui/auth/ui/TaskFailureLogger.java         |   5 +-
 .../ui/accountlink/WelcomeBackIdpPrompt.java  |  68 +------
 .../WelcomeBackPasswordPrompt.java            |  23 ++-
 .../auth/ui/email/RegisterEmailFragment.java  |  14 +-
 .../auth/ui/idp/AuthMethodPickerActivity.java |  20 +-
 .../auth/ui/idp/CredentialSignInHandler.java  |  12 ++
 .../ui/phone/PhoneVerificationActivity.java   | 121 +++++------
 .../com/firebase/ui/auth/util/AuthHelper.java |   9 +
 .../auth/util/accountlink/AccountLinker.java  | 189 ++++++++++++++++++
 .../util/accountlink/ManualMergeService.java  |  50 +++++
 .../util/accountlink/ManualMergeUtils.java    | 162 +++++++++++++++
 .../signincontainer/IdpSignInContainer.java   |  16 +-
 .../util/signincontainer/SignInDelegate.java  |  24 ++-
 .../ui/auth/testhelpers/AuthHelperShadow.java |  12 ++
 .../ui/auth/testhelpers/TestHelper.java       |  18 +-
 .../ui/email/RegisterEmailActivityTest.java   |  12 +-
 .../email/WelcomeBackPasswordPromptTest.java  |   3 +-
 .../ui/idp/AuthMethodPickerActivityTest.java  |  12 +-
 .../phone/PhoneVerificationActivityTest.java  |   3 +
 29 files changed, 866 insertions(+), 180 deletions(-)
 create mode 100644 auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
 create mode 100644 auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeService.java
 create mode 100644 auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java

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 1b01434e9..da8b6a8f1 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -55,6 +55,7 @@ public class AuthUiActivity extends AppCompatActivity {
     private static final String FIREBASE_PRIVACY_POLICY_URL = "https://firebase.google.com/terms/analytics/#7_privacy";
 
     private static final int RC_SIGN_IN = 100;
+    private static final String OVERRIDE_LOGIN_CHECKS_EXTRA = "overide_login_checks";
 
     @BindView(R.id.default_theme)
     RadioButton mUseDefaultTheme;
@@ -137,8 +138,9 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.google_scope_youtube_data)
     CheckBox mGoogleScopeYoutubeData;
 
-    public static Intent createIntent(Context context) {
-        return new Intent(context, AuthUiActivity.class);
+    public static Intent createIntent(Context context, boolean overrideLoginChecks) {
+        return new Intent(context, AuthUiActivity.class)
+                .putExtra(OVERRIDE_LOGIN_CHECKS_EXTRA, overrideLoginChecks);
     }
 
     @Override
@@ -147,8 +149,8 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.auth_ui_layout);
         ButterKnife.bind(this);
 
-        FirebaseAuth auth = FirebaseAuth.getInstance();
-        if (auth.getCurrentUser() != null) {
+        if (FirebaseAuth.getInstance().getCurrentUser() != null
+                && !getIntent().getBooleanExtra(OVERRIDE_LOGIN_CHECKS_EXTRA, false)) {
             startSignedInActivity(null);
             finish();
             return;
@@ -206,6 +208,7 @@ public void signIn(View view) {
                         .setPrivacyPolicyUrl(getSelectedPrivacyPolicyUrl())
                         .setIsSmartLockEnabled(mEnableCredentialSelector.isChecked(),
                                                mEnableHintSelector.isChecked())
+                        .setIsAccountLinkingEnabled(true, null)
                         .setAllowNewEmailAccounts(mAllowNewEmailAccounts.isChecked())
                         .build(),
                 RC_SIGN_IN);
@@ -229,6 +232,7 @@ private void handleSignInResponse(int resultCode, Intent data) {
         // Successfully signed in
         if (resultCode == RESULT_OK) {
             startSignedInActivity(response);
+            setResult(RESULT_OK);
             finish();
             return;
         } else {
diff --git a/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java b/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
index 72ec52629..ca9bd40ec 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
@@ -56,6 +56,7 @@ public class SignedInActivity extends AppCompatActivity {
 
     private static final String EXTRA_IDP_RESPONSE = "extra_idp_response";
     private static final String EXTRA_SIGNED_IN_CONFIG = "extra_signed_in_config";
+    private static final int RC_LINK_ACCOUNT = 4433;
 
     @BindView(android.R.id.content)
     View mRootView;
@@ -100,7 +101,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         FirebaseUser currentUser = FirebaseAuth.getInstance().getCurrentUser();
         if (currentUser == null) {
-            startActivity(AuthUiActivity.createIntent(this));
+            startActivity(AuthUiActivity.createIntent(this, false));
             finish();
             return;
         }
@@ -112,6 +113,15 @@ public void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
         populateProfile();
         populateIdpToken();
+        populatePrevUid();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == RC_LINK_ACCOUNT && resultCode == RESULT_OK) {
+            finish();
+        }
     }
 
     @OnClick(R.id.sign_out)
@@ -122,7 +132,7 @@ public void signOut() {
                     @Override
                     public void onComplete(@NonNull Task<Void> task) {
                         if (task.isSuccessful()) {
-                            startActivity(AuthUiActivity.createIntent(SignedInActivity.this));
+                            startActivity(AuthUiActivity.createIntent(SignedInActivity.this, false));
                             finish();
                         } else {
                             showSnackbar(R.string.sign_out_failed);
@@ -131,6 +141,11 @@ public void onComplete(@NonNull Task<Void> task) {
                 });
     }
 
+    @OnClick(R.id.link_account)
+    public void linkAccount() {
+        startActivityForResult(AuthUiActivity.createIntent(this, true), RC_LINK_ACCOUNT);
+    }
+
     @OnClick(R.id.delete_account)
     public void deleteAccountClicked() {
         new AlertDialog.Builder(this)
@@ -141,7 +156,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
                         deleteAccount();
                     }
                 })
-                .setNegativeButton("No", null)
+                .setNegativeButton(android.R.string.no, null)
                 .show();
     }
 
@@ -152,7 +167,7 @@ private void deleteAccount() {
                     @Override
                     public void onComplete(@NonNull Task<Void> task) {
                         if (task.isSuccessful()) {
-                            startActivity(AuthUiActivity.createIntent(SignedInActivity.this));
+                            startActivity(AuthUiActivity.createIntent(SignedInActivity.this, false));
                             finish();
                         } else {
                             showSnackbar(R.string.delete_account_failed);
@@ -230,6 +245,16 @@ private void populateIdpToken() {
         }
     }
 
+    private void populatePrevUid() {
+        String prevUid = mIdpResponse == null ? null : mIdpResponse.getPrevUid();
+
+        if (prevUid == null) {
+            findViewById(R.id.prev_uid_layout).setVisibility(View.GONE);
+        } else {
+            ((TextView) findViewById(R.id.prev_uid)).setText(prevUid);
+        }
+    }
+
     @MainThread
     private void showSnackbar(@StringRes int errorMessageRes) {
         Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG).show();
diff --git a/app/src/main/java/com/firebase/uidemo/database/ChatIndexActivity.java b/app/src/main/java/com/firebase/uidemo/database/ChatIndexActivity.java
index dbe9a68d6..e2e4f7671 100644
--- a/app/src/main/java/com/firebase/uidemo/database/ChatIndexActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/database/ChatIndexActivity.java
@@ -1,6 +1,5 @@
 package com.firebase.uidemo.database;
 
-import android.os.Bundle;
 import android.view.View;
 
 import com.firebase.ui.database.FirebaseIndexRecyclerAdapter;
@@ -13,12 +12,6 @@
 public class ChatIndexActivity extends ChatActivity {
     private DatabaseReference mChatIndicesRef;
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mChatIndicesRef = FirebaseDatabase.getInstance().getReference().child("chatIndices");
-    }
-
     @Override
     public void onClick(View v) {
         String uid = FirebaseAuth.getInstance().getCurrentUser().getUid();
@@ -34,6 +27,11 @@ public void onClick(View v) {
 
     @Override
     protected FirebaseRecyclerAdapter<Chat, ChatHolder> getAdapter() {
+        mChatIndicesRef = FirebaseDatabase.getInstance()
+                .getReference()
+                .child("chatIndices")
+                .child(FirebaseAuth.getInstance().getCurrentUser().getUid());
+
         return new FirebaseIndexRecyclerAdapter<Chat, ChatHolder>(
                 Chat.class,
                 R.layout.message,
diff --git a/app/src/main/res/layout/signed_in_layout.xml b/app/src/main/res/layout/signed_in_layout.xml
index 37e53875c..4be458891 100644
--- a/app/src/main/res/layout/signed_in_layout.xml
+++ b/app/src/main/res/layout/signed_in_layout.xml
@@ -38,21 +38,30 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="16dp"
+                android:layout_margin="8dp"
                 android:text="@string/sign_out" />
 
             <Button
-                android:id="@+id/delete_account"
+                android:id="@+id/link_account"
+                style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="16dp"
-                android:text="@string/delete_account_label"
-                android:theme="@style/WarnButton"
-                tools:ignore="ButtonStyle" />
+                android:layout_margin="8dp"
+                android:text="@string/link_account" />
 
         </LinearLayout>
 
+        <Button
+            android:id="@+id/delete_account"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="8dp"
+            android:text="@string/delete_account_label"
+            android:theme="@style/WarnButton"
+            tools:ignore="ButtonStyle" />
+
         <TextView
             style="@style/Base.TextAppearance.AppCompat.Subhead"
             android:layout_width="wrap_content"
@@ -107,6 +116,26 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/prev_uid_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/Base.TextAppearance.AppCompat.Subhead"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/prev_uid" />
+
+            <TextView
+                android:id="@+id/prev_uid"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textIsSelectable="true" />
+
+        </LinearLayout>
+
         <LinearLayout
             android:id="@+id/idp_token_layout"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8cfaef35a..099a86711 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,6 +50,8 @@
     <string name="default_theme">Default theme</string>
     <string name="configuration_required">Configuration is required - see README.md</string>
     <string name="other_options_header">Other Options:</string>
+    <string name="link_account">Link with new account</string>
+    <string name="prev_uid">Previous user id</string>
     <string name="rational_image_perm">This sample will read an image from local storage to upload to Cloud Storage.</string>
     <string name="anonymous_auth_failed_msg">Anonymous authentication failed, various components of the demo will not work. Make sure your device is online and that Anonymous Auth is configured in your Firebase project(https://console.firebase.google.com/project/_/authentication/providers)</string>
     <string name="extra_google_scopes">Example extra Google scopes</string>
diff --git a/auth/README.md b/auth/README.md
index dbdb5274f..48f874fa4 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -257,6 +257,24 @@ startActivityForResult(
     RC_SIGN_IN);
 ```
 
+The default FirebaseUI sign-in flow shows UI to either create a new account or sign into an existing account.
+If you are using
+[anonymous authentication](https://firebase.google.com/docs/auth/android/anonymous-auth)
+in your application before calling FirebaseUI,
+you may want to link the anonymous account to the permanent account the user selects in the UI flow.
+
+```java
+startActivityForResult(
+    AuthUI.getInstance()
+        .createSignInIntentBuilder()
+        .setIsAccountLinkingEnabled(true, MyManualMergeService.class) // Any two accounts can be linked together using this method.
+        .build(),
+    RC_SIGN_IN);
+```
+
+**There is a caveat associated with using the `setIsAccountLinkingEnabled` method**, see
+[handling account link failures](#handling-account-link-failures).
+
 #### Handling the sign-in response
 
 ##### Response codes
@@ -309,6 +327,78 @@ see the Firebase Auth documentation to
 [get the currently signed-in user](https://firebase.google.com/docs/auth/android/manage-users#get_the_currently_signed-in_user)
 and [register an AuthStateListener](https://firebase.google.com/docs/reference/android/com/google/firebase/auth/FirebaseAuth.html#addAuthStateListener(com.google.firebase.auth.FirebaseAuth.AuthStateListener)).
 
+##### Handling account link failures
+
+_Only applies to developers using `setIsAccountLinkingEnabled(true, Class)`._
+
+Imagine the following scenario: a user already has an existing account and uid in your app.
+Eventually, they switch devices and you automatically sign them in anonymously to give your users a
+frictionless UX by letting users interact with your app without being forced to log in immediately.
+Now, your anonymously signed in user quickly enters some data into your app before signing into
+their existing account so as not to forget why they came to your app in the first place. This UX is
+great for users, but problematic for us developers: your user now has two different ids that match
+the same person! The above example isn't just limited to anonymous accounts; **anytime a user has
+two existing accounts, a user collision will occur and you will have to manually merge those
+accounts together**. To help you do this, FirebaseUI provides a service to guides you through to
+process of loading and the transferring the user's data.
+
+The following is an example of how you would move data from the user's previous uid to their new one
+using the Firebase Realtime database, thus merging the two accounts.
+The example assumes you are using data structured similarly to the
+[sample](https://github.com/firebase/FirebaseUI-Android/blob/master/app/src/main/java/com/firebase/uidemo/database/ChatHolder.java):
+
+```java
+public class MyManualMergeService extends ManualMergeService {
+    private Iterable<DataSnapshot> mChatKeys;
+
+    @Override
+    public Task<Void> onLoadData() {
+        final TaskCompletionSource<Void> loadTask = new TaskCompletionSource<>();
+        FirebaseDatabase.getInstance()
+                .getReference()
+                .child("chatIndices")
+                .child(FirebaseAuth.getInstance().getCurrentUser().getUid())
+                .addListenerForSingleValueEvent(new ValueEventListener() {
+                    @Override
+                    public void onDataChange(DataSnapshot snapshot) {
+                        mChatKeys = snapshot.getChildren();
+                        loadTask.setResult(null);
+                    }
+
+                    @Override
+                    public void onCancelled(DatabaseError error) {
+                        FirebaseCrash.report(error.toException());
+                    }
+                });
+        return loadTask.getTask();
+    }
+
+    @Override
+    public Task<Void> onTransferData(IdpResponse response) {
+        String uid = FirebaseAuth.getInstance().getCurrentUser().getUid();
+        DatabaseReference chatIndices = FirebaseDatabase.getInstance()
+                .getReference()
+                .child("chatIndices")
+                .child(uid);
+        for (DataSnapshot snapshot : mChatKeys) {
+            chatIndices.child(snapshot.getKey()).setValue(true);
+            DatabaseReference chat = FirebaseDatabase.getInstance()
+                    .getReference()
+                    .child("chats")
+                    .child(snapshot.getKey());
+            chat.child("uid").setValue(uid);
+            chat.child("name").setValue("User " + uid.substring(0, 6));
+        }
+        return null;
+    }
+}
+```
+
+You'll also need to add the service to your `AndroidManifest.xml`:
+```xml
+<service android:name=".MyManualMergeService" />
+```
+
 ##### ID Tokens
 To retrieve the ID token that the IDP returned, you can extract an `IdpResponse` from the result
 Intent.
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 a4c239b28..0626054a1 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -32,6 +32,7 @@
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
 import com.firebase.ui.auth.util.GoogleSignInHelper;
 import com.firebase.ui.auth.util.Preconditions;
+import com.firebase.ui.auth.util.accountlink.ManualMergeService;
 import com.firebase.ui.auth.util.signincontainer.SmartLockBase;
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.common.api.Status;
@@ -553,12 +554,26 @@ public Intent build() {
      * Builder for the intent to start the user authentication flow.
      */
     public final class SignInIntentBuilder extends AuthIntentBuilder<SignInIntentBuilder> {
+        private boolean mIsAccountLinkingEnabled = false;
+        private Class<? extends ManualMergeService> mAccountLinkingListener;
         private boolean mAllowNewEmailAccounts = true;
 
         private SignInIntentBuilder() {
             super();
         }
 
+        /**
+         * Links the current user to an account created in the sign-in flow.
+         * <p>
+         * Linking is disabled by default because of a <a href="https://github.com/firebase/FirebaseUI-Android/blob/master/auth/README.md#handling-account-link-failures">caveat</a>.
+         */
+        public SignInIntentBuilder setIsAccountLinkingEnabled(boolean enabled,
+                                                              @Nullable Class<? extends ManualMergeService> listener) {
+            mIsAccountLinkingEnabled = enabled;
+            mAccountLinkingListener = listener;
+            return this;
+        }
+
         /**
          * Enables or disables creating new accounts in the email sign in flow.
          * <p>
@@ -580,6 +595,8 @@ protected FlowParameters getFlowParams() {
                     mPrivacyPolicyUrl,
                     mEnableCredentials,
                     mEnableHints,
+                    mIsAccountLinkingEnabled,
+                    mAccountLinkingListener,
                     mAllowNewEmailAccounts);
         }
     }
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 102f2250d..7833d06fa 100644
--- a/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
+++ b/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
@@ -120,6 +120,20 @@ public String getIdpSecret() {
         return mSecret;
     }
 
+    /**
+     * Only applies to developers using {@link AuthUI.SignInIntentBuilder#setIsAccountLinkingEnabled(boolean, Class)}
+     * set to {@code true}.
+     * <p><p>
+     * Get the previous user id if a user collision occurred.
+     * See the <a href="https://github.com/firebase/FirebaseUI-Android/blob/master/auth/README.md#handling-account-link-failures">README</a>
+     * for a much more detailed explanation.
+     *
+     * @see AuthUI.SignInIntentBuilder#setIsAccountLinkingEnabled(boolean, Class)
+     */
+    public String getPrevUid() {
+        return mUser.getPrevUid();
+    }
+
     /**
      * Get the error code for a failed sign in
      */
diff --git a/auth/src/main/java/com/firebase/ui/auth/User.java b/auth/src/main/java/com/firebase/ui/auth/User.java
index 0fb9da13d..f6acaa6dd 100644
--- a/auth/src/main/java/com/firebase/ui/auth/User.java
+++ b/auth/src/main/java/com/firebase/ui/auth/User.java
@@ -21,7 +21,8 @@ public User createFromParcel(Parcel in) {
                     in.readString(),
                     in.readString(),
                     in.readString(),
-                    in.<Uri>readParcelable(Uri.class.getClassLoader()));
+                    in.<Uri>readParcelable(Uri.class.getClassLoader()),
+                    in.readString());
         }
 
         @Override
@@ -36,12 +37,20 @@ public User[] newArray(int size) {
     private final String mName;
     private final Uri mPhotoUri;
 
-    private User(String providerId, String email, String phoneNumber, String name, Uri photoUri) {
+    private String mPrevUid;
+
+    private User(String providerId,
+                 String email,
+                 String phoneNumber,
+                 String name,
+                 Uri photoUri,
+                 String prevUid) {
         mProviderId = providerId;
         mEmail = email;
         mPhoneNumber = phoneNumber;
         mName = name;
         mPhotoUri = photoUri;
+        mPrevUid = prevUid;
     }
 
     public static User getUser(Intent intent) {
@@ -78,6 +87,15 @@ public Uri getPhotoUri() {
         return mPhotoUri;
     }
 
+    @Nullable
+    public String getPrevUid() {
+        return mPrevUid;
+    }
+
+    public void setPrevUid(@Nullable String prevUid) {
+        mPrevUid = prevUid;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -88,7 +106,8 @@ public boolean equals(Object o) {
         return mProviderId.equals(user.mProviderId)
                 && (mEmail == null ? user.mEmail == null : mEmail.equals(user.mEmail))
                 && (mName == null ? user.mName == null : mName.equals(user.mName))
-                && (mPhotoUri == null ? user.mPhotoUri == null : mPhotoUri.equals(user.mPhotoUri));
+                && (mPhotoUri == null ? user.mPhotoUri == null : mPhotoUri.equals(user.mPhotoUri))
+                && (mPrevUid == null ? user.mPrevUid == null : mPrevUid.equals(user.mPrevUid));
     }
 
     @Override
@@ -97,6 +116,7 @@ public int hashCode() {
         result = 31 * result + (mEmail == null ? 0 : mEmail.hashCode());
         result = 31 * result + (mName == null ? 0 : mName.hashCode());
         result = 31 * result + (mPhotoUri == null ? 0 : mPhotoUri.hashCode());
+        result = 31 * result + (mPrevUid == null ? 0 : mPrevUid.hashCode());
         return result;
     }
 
@@ -107,6 +127,7 @@ public String toString() {
                 ", mEmail='" + mEmail + '\'' +
                 ", mName='" + mName + '\'' +
                 ", mPhotoUri=" + mPhotoUri +
+                ", mPrevUid=" + mPrevUid +
                 '}';
     }
 
@@ -122,6 +143,7 @@ public void writeToParcel(@NonNull Parcel dest, int flags) {
         dest.writeString(mPhoneNumber);
         dest.writeString(mName);
         dest.writeParcelable(mPhotoUri, flags);
+        dest.writeString(mPrevUid);
     }
 
     public static class Builder {
@@ -131,6 +153,8 @@ public static class Builder {
         private String mName;
         private Uri mPhotoUri;
 
+        private String mPrevUid;
+
         public Builder(@AuthUI.SupportedProvider @NonNull String providerId,
                        @Nullable String email) {
             mProviderId = providerId;
@@ -152,8 +176,13 @@ public Builder setPhotoUri(Uri photoUri) {
             return this;
         }
 
+        public Builder setPrevUid(String prevUid) {
+            mPrevUid = prevUid;
+            return this;
+        }
+
         public User build() {
-            return new User(mProviderId, mEmail, mPhoneNumber, mName, mPhotoUri);
+            return new User(mProviderId, mEmail, mPhoneNumber, mName, mPhotoUri, mPrevUid);
         }
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java b/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java
index dea8597c0..e54422aa6 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java
@@ -25,6 +25,7 @@
 
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.util.Preconditions;
+import com.firebase.ui.auth.util.accountlink.ManualMergeService;
 
 import java.util.Collections;
 import java.util.List;
@@ -53,6 +54,9 @@ public class FlowParameters implements Parcelable {
     @Nullable
     public final String privacyPolicyUrl;
 
+    public final boolean accountLinkingEnabled;
+    @Nullable
+    public final Class<? extends ManualMergeService> accountLinkingListener;
     public final boolean allowNewEmailAccounts;
 
     public final boolean enableCredentials;
@@ -67,6 +71,8 @@ public FlowParameters(
             @Nullable String privacyPolicyUrl,
             boolean enableCredentials,
             boolean enableHints,
+            boolean accountLinkingEnabled,
+            @Nullable Class<? extends ManualMergeService> accountLinkingListener,
             boolean allowNewEmailAccounts) {
         this.appName = Preconditions.checkNotNull(appName, "appName cannot be null");
         this.providerInfo = Collections.unmodifiableList(
@@ -77,6 +83,8 @@ public FlowParameters(
         this.privacyPolicyUrl = privacyPolicyUrl;
         this.enableCredentials = enableCredentials;
         this.enableHints = enableHints;
+        this.accountLinkingEnabled = accountLinkingEnabled;
+        this.accountLinkingListener = accountLinkingListener;
         this.allowNewEmailAccounts = allowNewEmailAccounts;
     }
 
@@ -114,6 +122,8 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(privacyPolicyUrl);
         dest.writeInt(enableCredentials ? 1 : 0);
         dest.writeInt(enableHints ? 1 : 0);
+        dest.writeInt(accountLinkingEnabled ? 1 : 0);
+        dest.writeSerializable(accountLinkingListener);
         dest.writeInt(allowNewEmailAccounts ? 1 : 0);
     }
 
@@ -133,6 +143,9 @@ public FlowParameters createFromParcel(Parcel in) {
             String privacyPolicyUrl = in.readString();
             boolean enableCredentials = in.readInt() != 0;
             boolean enableHints = in.readInt() != 0;
+            boolean accountLinkingEnabled = in.readInt() != 0;
+            Class<? extends ManualMergeService> accountLinkingListener =
+                    (Class<? extends ManualMergeService>) in.readSerializable();
             boolean allowNewEmailAccounts = in.readInt() != 0;
 
             return new FlowParameters(
@@ -144,6 +157,8 @@ public FlowParameters createFromParcel(Parcel in) {
                     privacyPolicyUrl,
                     enableCredentials,
                     enableHints,
+                    accountLinkingEnabled,
+                    accountLinkingListener,
                     allowNewEmailAccounts);
         }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/TaskFailureLogger.java b/auth/src/main/java/com/firebase/ui/auth/ui/TaskFailureLogger.java
index 986f35d2d..0b8d0c6e4 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/TaskFailureLogger.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/TaskFailureLogger.java
@@ -18,6 +18,7 @@
 import android.util.Log;
 
 import com.google.android.gms.tasks.OnFailureListener;
+import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 
 public class TaskFailureLogger implements OnFailureListener {
     private String mTag;
@@ -30,6 +31,8 @@ public TaskFailureLogger(@NonNull String tag, @NonNull String message) {
 
     @Override
     public void onFailure(@NonNull Exception e) {
-        Log.w(mTag, mMessage, e);
+        if (!(e instanceof FirebaseAuthUserCollisionException)) {
+            Log.w(mTag, mMessage, e);
+        }
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
index 524f3462e..f5aa15b81 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
@@ -17,14 +17,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.ErrorCodes;
@@ -41,15 +39,9 @@
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.ui.TaskFailureLogger;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.android.gms.tasks.Task;
+import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.google.firebase.auth.AuthCredential;
-import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FacebookAuthProvider;
-import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
 
@@ -137,71 +129,19 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     @Override
-    public void onSuccess(final IdpResponse idpResponse) {
+    public void onSuccess(IdpResponse idpResponse) {
         AuthCredential newCredential = ProviderUtils.getAuthCredential(idpResponse);
         if (newCredential == null) {
             Log.e(TAG, "No credential returned");
             finish(RESULT_CANCELED, IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
-            return;
-        }
-
-        FirebaseUser currentUser = getAuthHelper().getCurrentUser();
-        if (currentUser == null) {
-            getAuthHelper().getFirebaseAuth()
-                    .signInWithCredential(newCredential)
-                    .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
-                        @Override
-                        public void onSuccess(AuthResult result) {
-                            if (mPrevCredential != null) {
-                                result.getUser()
-                                        .linkWithCredential(mPrevCredential)
-                                        .addOnFailureListener(new TaskFailureLogger(
-                                                TAG, "Error signing in with previous credential " +
-                                                idpResponse.getProviderType()))
-                                        .addOnCompleteListener(new FinishListener(idpResponse));
-                            } else {
-                                finish(RESULT_OK, idpResponse.toIntent());
-                            }
-                        }
-                    })
-                    .addOnFailureListener(new OnFailureListener() {
-                        @Override
-                        public void onFailure(@NonNull Exception e) {
-                            finishWithError();
-                        }
-                    })
-                    .addOnFailureListener(
-                            new TaskFailureLogger(TAG, "Error signing in with new credential " +
-                                    idpResponse.getProviderType()));
         } else {
-            currentUser
-                    .linkWithCredential(newCredential)
-                    .addOnFailureListener(
-                            new TaskFailureLogger(TAG, "Error linking with credential " +
-                                    idpResponse.getProviderType()))
-                    .addOnCompleteListener(new FinishListener(idpResponse));
+            AccountLinker.linkToNewUser(
+                    this, idpResponse, newCredential, mPrevCredential);
         }
     }
 
     @Override
     public void onFailure() {
-        finishWithError();
-    }
-
-    private void finishWithError() {
-        Toast.makeText(this, R.string.fui_general_error, Toast.LENGTH_LONG).show();
         finish(RESULT_CANCELED, IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
     }
-
-    private class FinishListener implements OnCompleteListener<AuthResult> {
-        private final IdpResponse mIdpResponse;
-
-        FinishListener(IdpResponse idpResponse) {
-            mIdpResponse = idpResponse;
-        }
-
-        public void onComplete(@NonNull Task task) {
-            finish(RESULT_OK, mIdpResponse.toIntent());
-        }
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
index bf72650e3..a5518063e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
@@ -43,14 +43,18 @@
 import com.firebase.ui.auth.ui.ImeHelper;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.RecoverPasswordActivity;
+import com.firebase.ui.auth.util.accountlink.ManualMergeUtils;
 import com.firebase.ui.auth.util.accountlink.ProfileMerger;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
 
+import java.util.concurrent.Callable;
+
 /**
  * Activity to link a pre-existing email/password account to a new IDP sign-in by confirming the
  * password before initiating a link.
@@ -145,21 +149,32 @@ private void validateAndSignIn(final String email, final String password) {
 
         final AuthCredential authCredential = ProviderUtils.getAuthCredential(mIdpResponse);
 
+        String prevUid = getAuthHelper().getUidForAccountLinking();
         final IdpResponse response;
         if (authCredential == null) {
             response = new IdpResponse.Builder(
-                    new User.Builder(EmailAuthProvider.PROVIDER_ID, email).build())
+                    new User.Builder(EmailAuthProvider.PROVIDER_ID, email)
+                            .setPrevUid(prevUid)
+                            .build())
                     .build();
         } else {
             response = new IdpResponse.Builder(mIdpResponse.getUser())
                     .setToken(mIdpResponse.getIdpToken())
                     .setSecret(mIdpResponse.getIdpSecret())
                     .build();
+            response.getUser().setPrevUid(prevUid);
         }
 
-        // Sign in with known email and the password provided
-        getAuthHelper().getFirebaseAuth()
-                .signInWithEmailAndPassword(email, password)
+        ManualMergeUtils.injectSignInTaskBetweenDataTransfer(this,
+                response,
+                new Callable<Task<AuthResult>>() {
+                    @Override
+                    public Task<AuthResult> call() throws Exception {
+                        // Sign in with known email and the password provided
+                        return getAuthHelper().getFirebaseAuth()
+                                .signInWithEmailAndPassword(email, password);
+                    }
+                })
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                     @Override
                     public void onSuccess(AuthResult authResult) {
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 2a21ac94e..633ae2a2f 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
@@ -227,6 +227,15 @@ private void validateAndRegisterUser() {
     }
 
     private void registerUser(final String email, final String name, final String password) {
+        Task<AuthResult> registerTask;
+        if (getAuthHelper().canLinkAccounts()) {
+            registerTask = getAuthHelper().getCurrentUser()
+                    .linkWithCredential(EmailAuthProvider.getCredential(email, password));
+        } else {
+            registerTask = getAuthHelper().getFirebaseAuth()
+                    .createUserWithEmailAndPassword(email, password);
+        }
+
         final IdpResponse response = new IdpResponse.Builder(
                 new User.Builder(EmailAuthProvider.PROVIDER_ID, email)
                         .setName(name)
@@ -234,10 +243,8 @@ private void registerUser(final String email, final String name, final String pa
                         .build())
                 .build();
 
-        getAuthHelper().getFirebaseAuth()
-                .createUserWithEmailAndPassword(email, password)
+        registerTask
                 .continueWithTask(new ProfileMerger(response))
-                .addOnFailureListener(new TaskFailureLogger(TAG, "Error creating user"))
                 .addOnSuccessListener(getActivity(), new OnSuccessListener<AuthResult>() {
                     @Override
                     public void onSuccess(AuthResult authResult) {
@@ -248,6 +255,7 @@ public void onSuccess(AuthResult authResult) {
                                 response);
                     }
                 })
+                .addOnFailureListener(new TaskFailureLogger(TAG, "Error creating user"))
                 .addOnFailureListener(getActivity(), new OnFailureListener() {
                     @Override
                     public void onFailure(@NonNull Exception e) {
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 46ccd93bd..16a0d5171 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
@@ -44,8 +44,11 @@
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
+import com.firebase.ui.auth.util.accountlink.ProfileMerger;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.AuthResult;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -69,7 +72,9 @@ public class AuthMethodPickerActivity extends AppCompatBase implements IdpCallba
 
     public static Intent createIntent(Context context, FlowParameters flowParams) {
         return HelperActivityBase.createBaseIntent(
-                context, AuthMethodPickerActivity.class, flowParams);
+                context,
+                AuthMethodPickerActivity.class,
+                flowParams);
     }
 
     @Override
@@ -158,8 +163,17 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     @Override
     public void onSuccess(IdpResponse response) {
         AuthCredential credential = ProviderUtils.getAuthCredential(response);
-        getAuthHelper().getFirebaseAuth()
-                .signInWithCredential(credential)
+
+        Task<AuthResult> signInTask;
+        if (getAuthHelper().canLinkAccounts()) {
+            signInTask = getAuthHelper().getCurrentUser()
+                    .linkWithCredential(credential)
+                    .continueWithTask(new ProfileMerger(response));
+        } else {
+            signInTask = getAuthHelper().getFirebaseAuth().signInWithCredential(credential);
+        }
+
+        signInTask
                 .addOnCompleteListener(new CredentialSignInHandler(
                         this,
                         mSaveSmartLock,
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
index 96f35ebbb..a498b09d4 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
@@ -26,6 +26,7 @@
 import com.firebase.ui.auth.User;
 import com.firebase.ui.auth.provider.ProviderUtils;
 import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
@@ -33,6 +34,7 @@
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
@@ -96,6 +98,16 @@ public void onFailure(@NonNull Exception e) {
     private class StartWelcomeBackFlow implements OnSuccessListener<String> {
         @Override
         public void onSuccess(String provider) {
+            AuthCredential credential = ProviderUtils.getAuthCredential(mResponse);
+            if (mActivity.getAuthHelper().canLinkAccounts()
+                    && credential != null
+                    && provider.equals(credential.getProvider())) {
+                // We don't want to show the welcome back dialog since the user selected
+                // an existing account and we can just link the two accounts without knowing
+                // prevCredential.
+                AccountLinker.linkWithCurrentUser(mActivity, mResponse, credential);
+                return;
+            }
             mActivity.getDialogHolder().dismissDialog();
 
             if (provider == null) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
index de2cf5878..f4dc48dc2 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
@@ -37,6 +37,7 @@
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseException;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuthException;
@@ -301,67 +302,71 @@ private void showAlertDialog(@NonNull String s, DialogInterface.OnClickListener
     }
 
     private void signIn(@NonNull PhoneAuthCredential credential) {
-        getAuthHelper().getFirebaseAuth()
-                .signInWithCredential(credential)
-                .addOnSuccessListener(this, new OnSuccessListener<AuthResult>() {
-                    @Override
-                    public void onSuccess(final AuthResult authResult) {
-                        mVerificationState = VerificationState.VERIFIED;
-                        completeLoadingDialog(getString(R.string.fui_verified));
-
-                        // Activity can be recreated before this message is handled
-                        mHandler.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                if (!mIsDestroyed) {
-                                    dismissLoadingDialog();
-                                    finish(authResult.getUser());
-                                }
-                            }
-                        }, SHORT_DELAY_MILLIS);
-                    }
-                })
-                .addOnFailureListener(this, new OnFailureListener() {
+        Task<AuthResult> signInTask;
+        if (getAuthHelper().canLinkAccounts()) {
+            signInTask = getAuthHelper().getCurrentUser().linkWithCredential(credential);
+        } else {
+            signInTask = getAuthHelper().getFirebaseAuth().signInWithCredential(credential);
+        }
+
+        signInTask.addOnSuccessListener(this, new OnSuccessListener<AuthResult>() {
+            @Override
+            public void onSuccess(final AuthResult authResult) {
+                mVerificationState = VerificationState.VERIFIED;
+                completeLoadingDialog(getString(R.string.fui_verified));
+
+                // Activity can be recreated before this message is handled
+                mHandler.postDelayed(new Runnable() {
                     @Override
-                    public void onFailure(@NonNull Exception e) {
-                        dismissLoadingDialog();
-                        //incorrect confirmation code
-                        if (e instanceof FirebaseAuthInvalidCredentialsException) {
-                            FirebaseAuthError error = FirebaseAuthError.fromException(
-                                    (FirebaseAuthInvalidCredentialsException) e);
-
-                            switch (error) {
-                                case ERROR_INVALID_VERIFICATION_CODE:
-                                    showAlertDialog(
-                                            getString(R.string.fui_incorrect_code_dialog_body),
-                                            new DialogInterface.OnClickListener() {
-                                                @Override
-                                                public void onClick(DialogInterface dialog, int which) {
-                                                    getSubmitConfirmationCodeFragment()
-                                                            .setConfirmationCode("");
-                                                }
-                                            });
-                                    break;
-                                case ERROR_SESSION_EXPIRED:
-                                    showAlertDialog(
-                                            getString(R.string.fui_error_session_expired),
-                                            new DialogInterface.OnClickListener() {
-                                                @Override
-                                                public void onClick(DialogInterface dialog, int which) {
-                                                    getSubmitConfirmationCodeFragment()
-                                                            .setConfirmationCode("");
-                                                }
-                                            });
-                                    break;
-                                default:
-                                    Log.w(PHONE_VERIFICATION_LOG_TAG, error.getDescription(), e);
-                                    showAlertDialog(error.getDescription(), null);
-                            }
-                        } else {
-                            showAlertDialog(e.getLocalizedMessage(), null);
+                    public void run() {
+                        if (!mIsDestroyed) {
+                            dismissLoadingDialog();
+                            finish(authResult.getUser());
                         }
                     }
-                });
+                }, SHORT_DELAY_MILLIS);
+            }
+        }).addOnFailureListener(this, new OnFailureListener() {
+            @Override
+            public void onFailure(@NonNull Exception e) {
+                dismissLoadingDialog();
+                //incorrect confirmation code
+                if (e instanceof FirebaseAuthInvalidCredentialsException) {
+                    FirebaseAuthError error = FirebaseAuthError.fromException(
+                            (FirebaseAuthInvalidCredentialsException) e);
+
+                    switch (error) {
+                        case ERROR_INVALID_VERIFICATION_CODE:
+                            showAlertDialog(
+                                    getString(R.string.fui_incorrect_code_dialog_body),
+                                    new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            getSubmitConfirmationCodeFragment()
+                                                    .setConfirmationCode("");
+                                        }
+                                    });
+                            break;
+                        case ERROR_SESSION_EXPIRED:
+                            showAlertDialog(
+                                    getString(R.string.fui_error_session_expired),
+                                    new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            getSubmitConfirmationCodeFragment()
+                                                    .setConfirmationCode("");
+                                        }
+                                    });
+                            break;
+                        default:
+                            Log.w(PHONE_VERIFICATION_LOG_TAG, error.getDescription(), e);
+                            showAlertDialog(error.getDescription(), null);
+                    }
+                } else {
+                    showAlertDialog(e.getLocalizedMessage(), null);
+                }
+            }
+        });
     }
 
     private void completeLoadingDialog(String content) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java b/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java
index faec0243f..8ae535af9 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java
@@ -36,6 +36,15 @@ public FirebaseUser getCurrentUser() {
         return getFirebaseAuth().getCurrentUser();
     }
 
+    public boolean canLinkAccounts() {
+        return mFlowParams.accountLinkingEnabled && getCurrentUser() != null;
+    }
+
+    @Nullable
+    public String getUidForAccountLinking() {
+        return canLinkAccounts() ? getCurrentUser().getUid() : null;
+    }
+
     public SaveSmartLock getSaveSmartLockInstance(HelperActivityBase activity) {
         return SaveSmartLock.getInstance(activity);
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
new file mode 100644
index 000000000..4bfc886f2
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
@@ -0,0 +1,189 @@
+package com.firebase.ui.auth.util.accountlink;
+
+import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RestrictTo;
+import android.util.Log;
+
+import com.firebase.ui.auth.ErrorCodes;
+import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.ui.TaskFailureLogger;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.FirebaseAuthUserCollisionException;
+import com.google.firebase.auth.FirebaseUser;
+
+import java.util.concurrent.Callable;
+
+/**
+ * "One link to rule them all." - AccountLinker
+ * <p><p>
+ * AccountLinker can handle up to 3 way account linking: user is currently logged in anonymously,
+ * has an existing Google account, and is trying to log in with Facebook. Results: Google and
+ * Facebook are linked and the uid of the anonymous account is returned for manual merging.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class AccountLinker implements OnSuccessListener<AuthResult>, OnFailureListener {
+    private static final String TAG = "AccountLinker";
+
+    private final HelperActivityBase mActivity;
+    private final IdpResponse mIdpResponse;
+
+    /** The credential of the user's existing account. */
+    private final AuthCredential mExistingCredential;
+
+    /** The credential the user originally tried to sign in with. */
+    @Nullable private final AuthCredential mNewCredential;
+
+    private AccountLinker(HelperActivityBase activity,
+                          IdpResponse response,
+                          @NonNull AuthCredential existingCredential,
+                          @Nullable AuthCredential newCredential) {
+        mActivity = activity;
+        mIdpResponse = response;
+        mExistingCredential = existingCredential;
+        mNewCredential = newCredential;
+
+        start();
+    }
+
+    public static void linkWithCurrentUser(HelperActivityBase activity,
+                                           IdpResponse response,
+                                           AuthCredential existingCredential) {
+        new AccountLinker(activity, response, existingCredential, null);
+    }
+
+    public static void linkToNewUser(HelperActivityBase activity,
+                                     IdpResponse response,
+                                     AuthCredential existingCredential,
+                                     AuthCredential newCredential) {
+        new AccountLinker(activity, response, existingCredential, newCredential);
+    }
+
+    private void start() {
+        FirebaseUser currentUser = mActivity.getAuthHelper().getCurrentUser();
+        if (currentUser == null) {
+            // The user has an existing account and is trying to log in with a new provider
+            mActivity.getAuthHelper().getFirebaseAuth()
+                    .signInWithCredential(mExistingCredential)
+                    .addOnSuccessListener(this)
+                    .addOnFailureListener(new OnFailureListener() {
+                        @Override
+                        public void onFailure(@NonNull Exception e) {
+                            finishWithError();
+                        }
+                    })
+                    .addOnFailureListener(
+                            new TaskFailureLogger(TAG, "Error signing in with new credential"));
+        } else {
+            // If the current user is trying to sign in with a new account, just link the two
+            // and we should be fine. Otherwise, we are probably working with an anonymous account
+            // trying to be linked to an existing account which is bound to fail.
+            currentUser
+                    .linkWithCredential(mNewCredential == null ? mExistingCredential : mNewCredential)
+                    .continueWithTask(new ProfileMerger(mIdpResponse))
+                    .addOnSuccessListener(new FinishListener())
+                    .addOnFailureListener(this)
+                    .addOnFailureListener(
+                            new TaskFailureLogger(TAG, "Error linking with credential"));
+        }
+    }
+
+    @Override
+    public void onSuccess(AuthResult result) {
+        if (mNewCredential == null) {
+            mActivity.finish(Activity.RESULT_OK, mIdpResponse.toIntent());
+        } else {
+            // Link the user's existing account (mExistingCredential) with the account they were
+            // trying to sign in to (mNewCredential)
+            result.getUser()
+                    .linkWithCredential(mNewCredential)
+                    .continueWithTask(new ProfileMerger(mIdpResponse))
+                    .addOnFailureListener(new TaskFailureLogger(
+                            TAG, "Error signing in with previous credential"))
+                    .addOnCompleteListener(new FinishListener());
+        }
+    }
+
+    @Override
+    public void onFailure(@NonNull Exception e) {
+        if (e instanceof FirebaseAuthUserCollisionException
+                && mActivity.getAuthHelper().canLinkAccounts()) {
+            mIdpResponse.getUser().setPrevUid(mActivity.getAuthHelper().getUidForAccountLinking());
+
+            // Since we still want the user to be able to sign in even though
+            // they have an existing account, we are going to save the uid of the
+            // current user, log them out, and then sign in with the new credential.
+            Task<AuthResult> signInTask = ManualMergeUtils.injectSignInTaskBetweenDataTransfer(mActivity,
+                    mIdpResponse,
+                    new Callable<Task<AuthResult>>() {
+                        @Override
+                        public Task<AuthResult> call() throws Exception {
+                            return mActivity.getAuthHelper().getFirebaseAuth()
+                                    .signInWithCredential(mExistingCredential)
+                                    .continueWithTask(new ProfileMerger(mIdpResponse));
+                        }
+                    })
+                    .addOnFailureListener(new OnFailureListener() {
+                        @Override
+                        public void onFailure(@NonNull Exception e) {
+                            finishWithError();
+                        }
+                    })
+                    .addOnFailureListener(
+                            new TaskFailureLogger(TAG, "Error signing in with credential"));
+
+            // Occurs when the user is logged and they are trying to sign in with an existing account.
+            if (mNewCredential == null) {
+                signInTask.addOnSuccessListener(new FinishListener());
+            } else {
+                // 3 way account linking!!!
+                // Occurs if the user is logged, trying to sign in with a new provider,
+                // and already has existing providers.
+                signInTask.addOnSuccessListener(new OnSuccessListener<AuthResult>() {
+                    @Override
+                    public void onSuccess(AuthResult result) {
+                        mActivity.getAuthHelper().getCurrentUser()
+                                .linkWithCredential(mNewCredential)
+                                .continueWithTask(new ProfileMerger(mIdpResponse))
+                                .addOnFailureListener(
+                                        new TaskFailureLogger(TAG, "Error linking with credential"))
+                                .addOnCompleteListener(new FinishListener());
+                    }
+                });
+            }
+        } else {
+            Log.w(TAG, "See AuthUI.SignInIntentBuilder#setIsAccountLinkingEnabled(boolean, Class)"
+                    + " to support account linking");
+            finishWithError();
+        }
+    }
+
+    private void finishWithError() {
+        mActivity.finish(
+                Activity.RESULT_CANCELED,
+                IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
+    }
+
+    private class FinishListener implements OnCompleteListener<AuthResult>, OnSuccessListener<AuthResult> {
+        @Override
+        public void onComplete(@NonNull Task task) {
+            finishOk();
+        }
+
+        @Override
+        public void onSuccess(AuthResult result) {
+            finishOk();
+        }
+
+        private void finishOk() {
+            mActivity.finish(Activity.RESULT_OK, mIdpResponse.toIntent());
+        }
+    }
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeService.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeService.java
new file mode 100644
index 000000000..352c6e692
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeService.java
@@ -0,0 +1,50 @@
+package com.firebase.ui.auth.util.accountlink;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.support.annotation.Nullable;
+
+import com.firebase.ui.auth.AuthUI;
+import com.firebase.ui.auth.IdpResponse;
+import com.google.android.gms.tasks.Task;
+
+/**
+ * This service is to be used in conjunction with {@link AuthUI.SignInIntentBuilder#setIsAccountLinkingEnabled(boolean,
+ * Class)}. See a detailed explanation on <a href="https://github.com/firebase/FirebaseUI-Android/blob/master/auth/README.md#handling-account-link-failures">how
+ * to use this service</a>.
+ */
+public abstract class ManualMergeService extends Service {
+    private final IBinder mBinder = new ManualMergeUtils.MergeBinder(this);
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+
+    /**
+     * During this phase of the login process, you should load any data to be transferred from the
+     * current user to a new one created in the sign-in flow.
+     * <p>
+     * <i>Note:</i> this service will stay alive until {@link #onTransferData(IdpResponse)}
+     * completes so you may store your data in a field.
+     *
+     * @return a task to load your user's data or null if you can load the data synchronously
+     * without blocking the main thread. The login process will wait to create the new user until
+     * this task completes thus allowing you to work around security rules.
+     */
+    @Nullable
+    public abstract Task<Void> onLoadData();
+
+    /**
+     * During this phase of the login process, you should transfer the data you loaded in {@link
+     * #onLoadData()} to the new user's account.
+     *
+     * @param response the new user's metadata
+     * @return a task to transfer the old user's data to the new one or null if you don't need to
+     * wait for the data to be transferred. <i>Note:</i> the sign-in won't complete until this task
+     * is complete.
+     */
+    @Nullable
+    public abstract Task<Void> onTransferData(IdpResponse response);
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java
new file mode 100644
index 000000000..650fe0cca
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java
@@ -0,0 +1,162 @@
+package com.firebase.ui.auth.util.accountlink;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Binder;
+import android.os.IBinder;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.google.android.gms.tasks.Continuation;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.gms.tasks.Tasks;
+
+import java.util.concurrent.Callable;
+
+public final class ManualMergeUtils {
+    private ManualMergeUtils() {
+        throw new AssertionError("No instance for you!");
+    }
+
+    public static <T> Task<T> injectSignInTaskBetweenDataTransfer(
+            final HelperActivityBase activity,
+            final IdpResponse response,
+            final Callable<Task<T>> insertTask) {
+        if (response.getUser().getPrevUid() == null
+                || activity.getFlowParams().accountLinkingListener == null) try {
+            return insertTask.call();
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+
+        final ServiceConnection keepServiceAliveConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {}
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {}
+        };
+        bindService(activity, keepServiceAliveConnection);
+
+        return getLoadDataTask(activity, response)
+                .continueWithTask(new Continuation<Void, Task<T>>() {
+                    @Override
+                    public Task<T> then(@NonNull Task<Void> task) throws Exception {
+                        return insertTask.call();
+                    }
+                })
+                .continueWithTask(new Continuation<T, Task<T>>() {
+                    @Override
+                    public Task<T> then(@NonNull Task<T> task) throws Exception {
+                        return getTransferDataTask(activity, response, task);
+                    }
+                })
+                .continueWith(new Continuation<T, T>() {
+                    @Override
+                    public T then(@NonNull Task<T> task) throws Exception {
+                        unbindService(activity, keepServiceAliveConnection);
+                        return task.getResult();
+                    }
+                });
+    }
+
+    private static Task<Void> getLoadDataTask(HelperActivityBase activity, IdpResponse response) {
+        return getDataTask(activity, new MergeServiceConnection() {
+            @Override
+            protected Task<Void> getDataTask(ManualMergeService service) {
+                return service.onLoadData();
+            }
+        });
+    }
+
+    private static <T> Task<T> getTransferDataTask(HelperActivityBase activity,
+                                                   final IdpResponse response,
+                                                   final Task<T> originalTask) {
+        return getDataTask(activity, new MergeServiceConnection() {
+            @Override
+            protected Task<Void> getDataTask(ManualMergeService service) {
+                return service.onTransferData(response);
+            }
+        }).continueWith(new Continuation<Void, T>() {
+            @Override
+            public T then(@NonNull Task<Void> task) throws Exception {
+                return originalTask.getResult();
+            }
+        });
+    }
+
+    private static Task<Void> getDataTask(final HelperActivityBase activity,
+                                          final MergeServiceConnection connection) {
+        TaskCompletionSource<Void> task = new TaskCompletionSource<>();
+        bindService(activity, connection.setTask(task));
+        return task.getTask().continueWith(new Continuation<Void, Void>() {
+            @Override
+            public Void then(@NonNull Task<Void> task) throws Exception {
+                unbindService(activity, connection);
+                return task.getResult();
+            }
+        });
+    }
+
+    private static void bindService(HelperActivityBase activity,
+                                    ServiceConnection connection) {
+        Context appContext = activity.getApplicationContext();
+        appContext.bindService(
+                new Intent(appContext, activity.getFlowParams().accountLinkingListener),
+                connection,
+                Context.BIND_AUTO_CREATE);
+    }
+
+    private static void unbindService(HelperActivityBase activity, ServiceConnection connection) {
+        activity.getApplicationContext().unbindService(connection);
+    }
+
+    public static final class MergeBinder extends Binder {
+        private final ManualMergeService mService;
+
+        public MergeBinder(ManualMergeService service) {
+            mService = service;
+        }
+
+        public ManualMergeService getService() {
+            return mService;
+        }
+    }
+
+    private abstract static class MergeServiceConnection implements ServiceConnection {
+        protected TaskCompletionSource<Void> mTask;
+
+        protected MergeServiceConnection setTask(TaskCompletionSource<Void> task) {
+            mTask = task;
+            return this;
+        }
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            Task<Void> task = getDataTask(((MergeBinder) service).getService());
+
+            if (task == null) { task = Tasks.forResult(null); }
+
+            task.continueWith(new Continuation<Void, Void>() {
+                @Override
+                public Void then(@NonNull Task<Void> task) throws Exception {
+                    mTask.setResult(null);
+                    return null;
+                }
+            });
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mTask.trySetException(new IllegalStateException("ManualMergeService disconnected"));
+        }
+
+        @Nullable
+        protected abstract Task<Void> getDataTask(ManualMergeService service);
+    }
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
index 88c32ea96..d898b1613 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
@@ -40,8 +40,11 @@
 import com.firebase.ui.auth.ui.FragmentBase;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
+import com.firebase.ui.auth.util.accountlink.ProfileMerger;
 import com.firebase.ui.auth.ui.idp.CredentialSignInHandler;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
@@ -142,8 +145,17 @@ public void onSaveInstanceState(Bundle outState) {
     @Override
     public void onSuccess(IdpResponse response) {
         AuthCredential credential = ProviderUtils.getAuthCredential(response);
-        getAuthHelper().getFirebaseAuth()
-                .signInWithCredential(credential)
+
+        Task<AuthResult> signInTask;
+        if (getAuthHelper().canLinkAccounts()) {
+            signInTask = getAuthHelper().getCurrentUser()
+                    .linkWithCredential(credential)
+                    .continueWithTask(new ProfileMerger(response));
+        } else {
+            signInTask = getAuthHelper().getFirebaseAuth().signInWithCredential(credential);
+        }
+
+        signInTask
                 .addOnCompleteListener(new CredentialSignInHandler(
                         mActivity,
                         mSaveSmartLock,
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
index 282f9bdbc..a3c17708c 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
@@ -19,12 +19,14 @@
 import com.firebase.ui.auth.User;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
 import com.firebase.ui.auth.ui.phone.PhoneVerificationActivity;
 import com.firebase.ui.auth.util.GoogleApiHelper;
 import com.firebase.ui.auth.util.GoogleSignInHelper;
+import com.firebase.ui.auth.util.accountlink.ManualMergeUtils;
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.auth.api.credentials.CredentialRequest;
@@ -48,6 +50,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
 
 /**
  * Attempts to acquire a credential from Smart Lock for Passwords to sign in an existing account. If
@@ -272,13 +275,24 @@ private void startAuthMethodChoice() {
      * with {@link Activity#RESULT_OK}. On failure, delete the credential from SmartLock (if
      * applicable) and then launch the auth method picker flow.
      */
-    private void signInWithEmailAndPassword(String email, String password) {
+    private void signInWithEmailAndPassword(final String email, final String password) {
+        // Because we are being called from Smart Lock,
+        // we can assume that the account already exists and a user collision exception will be thrown
+        // so we don't bother with linking credentials
         final IdpResponse response =
-                new IdpResponse.Builder(new User.Builder(EmailAuthProvider.PROVIDER_ID, email).build())
-                        .build();
+                new IdpResponse.Builder(new User.Builder(EmailAuthProvider.PROVIDER_ID, email)
+                        .setPrevUid(getAuthHelper().getUidForAccountLinking())
+                        .build()).build();
 
-        getAuthHelper().getFirebaseAuth()
-                .signInWithEmailAndPassword(email, password)
+        ManualMergeUtils.injectSignInTaskBetweenDataTransfer((HelperActivityBase) getActivity(),
+                response,
+                new Callable<Task<AuthResult>>() {
+                    @Override
+                    public Task<AuthResult> call() throws Exception {
+                        return getAuthHelper().getFirebaseAuth()
+                                .signInWithEmailAndPassword(email, password);
+                    }
+                })
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                     @Override
                     public void onSuccess(AuthResult authResult) {
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java
index 02ccc3900..63920bc6f 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java
@@ -17,6 +17,8 @@
 @Implements(AuthHelper.class)
 public class AuthHelperShadow {
 
+    public static Boolean sCanLinkAccounts = true;
+
     private static FirebaseAuth sFirebaseAuth;
     private static FirebaseUser sFirebaseUser;
     private static CredentialsApi sCredentialsApi;
@@ -53,6 +55,16 @@ public static FirebaseUser getCurrentUser() {
         return sFirebaseUser;
     }
 
+    @Implementation
+    public static boolean canLinkAccounts() {
+        return sCanLinkAccounts;
+    }
+
+    @Implementation
+    public static String getUidForAccountLinking() {
+        return TestConstants.UID;
+    }
+
     @Implementation
     public static SaveSmartLock getSaveSmartLockInstance(HelperActivityBase activity) {
         if (sSaveSmartLock == null) {
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 42ee650a8..aa5b897aa 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
@@ -79,16 +79,23 @@ public static FlowParameters getFlowParameters(List<String> providerIds) {
                 null  /* privacyPolicyUrl */,
                 true  /* credentialPickerEnabled */,
                 true  /* hintSelectorEnabled */,
+                true, /* accountLinkingEnabled */
+                null, /* accountLinkingListener */
                 true  /* allowNewEmailAccounts */);
     }
 
-    public static void verifySmartLockSave(String providerId, String email, String password) {
-        verifySmartLockSave(providerId, email, password, null);
+    public static void verifySmartLockSave(String providerId,
+                                           String email,
+                                           String password,
+                                           String accountLinkingUid) {
+        verifySmartLockSave(providerId, email, password, accountLinkingUid, null);
     }
 
-    public static void verifySmartLockSave(String providerId, String email,
-                                           String password, String phoneNumber) {
-
+    public static void verifySmartLockSave(String providerId,
+                                           String email,
+                                           String password,
+                                           String accountLinkingUid,
+                                           String phoneNumber) {
         ArgumentCaptor<FirebaseUser> userCaptor = ArgumentCaptor.forClass(FirebaseUser.class);
         ArgumentCaptor<String> passwordCaptor = ArgumentCaptor.forClass(String.class);
         ArgumentCaptor<IdpResponse> idpResponseCaptor = ArgumentCaptor.forClass(IdpResponse.class);
@@ -103,6 +110,7 @@ public static void verifySmartLockSave(String providerId, String email,
         assertEquals(email, userCaptor.getValue().getEmail());
         assertEquals(password, passwordCaptor.getValue());
         assertEquals(providerId, idpResponseCaptor.getValue().getProviderType());
+        assertEquals(accountLinkingUid, idpResponseCaptor.getValue().getPrevUid());
 
         // Check phone number (if necessary)
         if (phoneNumber != null) {
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
index 252742c9c..3b11808c7 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
@@ -28,6 +28,7 @@
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
 import com.firebase.ui.auth.testhelpers.TestConstants;
 import com.firebase.ui.auth.testhelpers.TestHelper;
+import com.google.firebase.auth.EmailAuthCredential;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.UserProfileChangeRequest;
 
@@ -120,8 +121,8 @@ public void testSignUpButton_successfulRegistrationShouldContinueToSaveCredentia
         name.setText(TestConstants.NAME);
         password.setText(TestConstants.PASSWORD);
 
-        when(AuthHelperShadow.getFirebaseAuth()
-                .createUserWithEmailAndPassword(TestConstants.EMAIL, TestConstants.PASSWORD))
+        AuthHelperShadow.sCanLinkAccounts = true;
+        when(AuthHelperShadow.getCurrentUser().linkWithCredential(any(EmailAuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
         when(AuthHelperShadow.getCurrentUser().updateProfile(any(UserProfileChangeRequest.class)))
                 .thenReturn(new AutoCompleteTask<Void>(null, true, null));
@@ -130,13 +131,14 @@ public void testSignUpButton_successfulRegistrationShouldContinueToSaveCredentia
         button.performClick();
 
         // Verify create user request
-        verify(AuthHelperShadow.getFirebaseAuth())
-                .createUserWithEmailAndPassword(TestConstants.EMAIL, TestConstants.PASSWORD);
+        verify(AuthHelperShadow.getCurrentUser())
+                .linkWithCredential(any(EmailAuthCredential.class));
 
         // Finally, the new credential should be saved to SmartLock
         TestHelper.verifySmartLockSave(
                 EmailAuthProvider.PROVIDER_ID,
                 TestConstants.EMAIL,
-                TestConstants.PASSWORD);
+                TestConstants.PASSWORD,
+                null);
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
index 45978d863..0b023fe89 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
@@ -117,6 +117,7 @@ public void testSignInButton_signsInAndSavesCredentials() {
         verifySmartLockSave(
                 EmailAuthProvider.PROVIDER_ID,
                 TestConstants.EMAIL,
-                TestConstants.PASSWORD);
+                TestConstants.PASSWORD,
+                TestConstants.UID);
     }
 }
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 74608d885..94fb215f9 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
@@ -33,7 +33,9 @@
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
 import com.firebase.ui.auth.ui.phone.PhoneVerificationActivity;
 import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.FacebookAuthCredential;
 import com.google.firebase.auth.FacebookAuthProvider;
+import com.google.firebase.auth.GoogleAuthCredential;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
 
@@ -123,7 +125,8 @@ public void testFacebookLoginFlow() {
 
         when(AuthHelperShadow.getCurrentUser().getProviders())
                 .thenReturn(Arrays.asList(FacebookAuthProvider.PROVIDER_ID));
-        when(AuthHelperShadow.getFirebaseAuth().signInWithCredential((AuthCredential) any()))
+        when(AuthHelperShadow.getCurrentUser()
+                     .linkWithCredential(any(FacebookAuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
 
         List<String> providers = Arrays.asList(AuthUI.FACEBOOK_PROVIDER);
@@ -134,7 +137,7 @@ public void testFacebookLoginFlow() {
         assertNotNull(facebookButton);
         facebookButton.performClick();
 
-        verifySmartLockSave(AuthUI.FACEBOOK_PROVIDER, TestConstants.EMAIL, null);
+        verifySmartLockSave(AuthUI.FACEBOOK_PROVIDER, TestConstants.EMAIL, null, null);
     }
 
     @Test
@@ -150,7 +153,8 @@ public void testGoogleLoginFlow() {
         when(AuthHelperShadow.getCurrentUser().getProviders())
                 .thenReturn(Arrays.asList(GoogleAuthProvider.PROVIDER_ID));
 
-        when(AuthHelperShadow.getFirebaseAuth().signInWithCredential((AuthCredential) any()))
+        when(AuthHelperShadow.getCurrentUser()
+                     .linkWithCredential(any(GoogleAuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
 
         Button googleButton = authMethodPickerActivity.findViewById(R.id.google_button);
@@ -158,7 +162,7 @@ public void testGoogleLoginFlow() {
         assertNotNull(googleButton);
         googleButton.performClick();
 
-        verifySmartLockSave(AuthUI.GOOGLE_PROVIDER, TestConstants.EMAIL, null);
+        verifySmartLockSave(AuthUI.GOOGLE_PROVIDER, TestConstants.EMAIL, null, null);
     }
 
     @Test
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
index df9651275..337bb49d4 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
@@ -208,6 +208,7 @@ public void testVerifyPhoneNumber_success() {
     @Config(shadows = {AuthHelperShadow.class})
     public void testSubmitCode_badCodeShowsAlertDialog() {
         reset(AuthHelperShadow.getPhoneAuthProvider());
+        AuthHelperShadow.sCanLinkAccounts = false;
         when(AuthHelperShadow.getFirebaseAuth().signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<AuthResult>(
                         null, true,
@@ -269,6 +270,7 @@ public void testAutoVerify() {
 
         when(AuthHelperShadow.getCurrentUser().getPhoneNumber()).thenReturn(PHONE);
         when(AuthHelperShadow.getCurrentUser().getEmail()).thenReturn(null);
+        AuthHelperShadow.sCanLinkAccounts = false;
         when(AuthHelperShadow.getFirebaseAuth().signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
         mActivity.verifyPhoneNumber(PHONE, false);
@@ -296,6 +298,7 @@ public void testSMSAutoRetrieval() {
 
         when(AuthHelperShadow.getCurrentUser().getPhoneNumber()).thenReturn(PHONE);
         when(AuthHelperShadow.getCurrentUser().getEmail()).thenReturn(null);
+        AuthHelperShadow.sCanLinkAccounts = false;
 
         when(AuthHelperShadow.getFirebaseAuth().signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));

From 3b2f13dcae0f2a8b958c3af4876c03a1172647f8 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Sat, 12 Aug 2017 18:04:12 -0700
Subject: [PATCH 02/28] Improve sign-in UX when user has multiple providers

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../ui/auth/provider/ProviderUtils.java       | 12 +++--
 .../auth/ui/idp/CredentialSignInHandler.java  | 50 ++++++++++++-------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/ProviderUtils.java b/auth/src/main/java/com/firebase/ui/auth/provider/ProviderUtils.java
index f9b25b0a0..cbd2aaf6d 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/ProviderUtils.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/ProviderUtils.java
@@ -65,11 +65,15 @@ public static Task<String> fetchTopProvider(FirebaseAuth auth, @NonNull String e
                     @Override
                     public String then(@NonNull Task<ProviderQueryResult> task) throws Exception {
                         if (!task.isSuccessful()) return null;
-
-                        List<String> providers = task.getResult().getProviders();
-                        return providers == null || providers.isEmpty()
-                                ? null : providers.get(providers.size() - 1);
+                        return getLastUsedProvider(task.getResult());
                     }
                 });
     }
+
+    @Nullable
+    public static String getLastUsedProvider(ProviderQueryResult result) {
+        List<String> providers = result.getProviders();
+        return providers == null || providers.isEmpty()
+                ? null : providers.get(providers.size() - 1);
+    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
index a498b09d4..904cb1bb9 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
@@ -19,27 +19,33 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
+import android.text.TextUtils;
 import android.util.Log;
 
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.User;
 import com.firebase.ui.auth.provider.ProviderUtils;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.util.accountlink.AccountLinker;
+import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
+import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
 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.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.ProviderQueryResult;
+
+import java.util.List;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class CredentialSignInHandler implements OnCompleteListener<AuthResult> {
@@ -69,20 +75,28 @@ public void onComplete(@NonNull Task<AuthResult> task) {
             mActivity.saveCredentialsOrFinish(mSmartLock, firebaseUser, mResponse);
         } else {
             if (task.getException() instanceof FirebaseAuthUserCollisionException) {
+                Task<ProviderQueryResult> fetchTask;
                 String email = mResponse.getEmail();
-                if (email != null) {
-                    FirebaseAuth auth = mActivity.getAuthHelper().getFirebaseAuth();
-                    ProviderUtils.fetchTopProvider(auth, email)
-                            .addOnSuccessListener(new StartWelcomeBackFlow())
-                            .addOnFailureListener(new OnFailureListener() {
-                                @Override
-                                public void onFailure(@NonNull Exception e) {
-                                    Intent intent = IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR);
-                                    mActivity.finish(Activity.RESULT_CANCELED, intent);
-                                }
-                            });
-                    return;
+
+                if (TextUtils.isEmpty(email)) {
+                    fetchTask = Tasks.forException(new NullPointerException("Email cannot be empty"));
+                } else {
+                    fetchTask = mActivity.getAuthHelper()
+                            .getFirebaseAuth()
+                            .fetchProvidersForEmail(email);
                 }
+
+                fetchTask
+                        .addOnSuccessListener(new StartWelcomeBackFlow())
+                        .addOnFailureListener(new OnFailureListener() {
+                            @Override
+                            public void onFailure(@NonNull Exception e) {
+                                Intent intent = IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR);
+                                mActivity.finish(Activity.RESULT_CANCELED, intent);
+                            }
+                        })
+                        .addOnFailureListener(new TaskFailureLogger(TAG,
+                                "Error fetching providers for email"));
             } else {
                 Log.e(TAG,
                       "Unexpected exception when signing in with credential "
@@ -95,13 +109,14 @@ public void onFailure(@NonNull Exception e) {
         }
     }
 
-    private class StartWelcomeBackFlow implements OnSuccessListener<String> {
+    private class StartWelcomeBackFlow implements OnSuccessListener<ProviderQueryResult> {
         @Override
-        public void onSuccess(String provider) {
+        public void onSuccess(ProviderQueryResult result) {
+            List<String> providers = result.getProviders();
             AuthCredential credential = ProviderUtils.getAuthCredential(mResponse);
             if (mActivity.getAuthHelper().canLinkAccounts()
                     && credential != null
-                    && provider.equals(credential.getProvider())) {
+                    && providers != null && providers.contains(credential.getProvider())) {
                 // We don't want to show the welcome back dialog since the user selected
                 // an existing account and we can just link the two accounts without knowing
                 // prevCredential.
@@ -110,6 +125,7 @@ public void onSuccess(String provider) {
             }
             mActivity.getDialogHolder().dismissDialog();
 
+            @AuthUI.SupportedProvider String provider = ProviderUtils.getLastUsedProvider(result);
             if (provider == null) {
                 throw new IllegalStateException(
                         "No provider even though we received a FirebaseAuthUserCollisionException");

From e56eaed9ebda0507c66d4acaade6b1802dcdf139 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Tue, 15 Aug 2017 14:28:27 -0700
Subject: [PATCH 03/28] Fix progress dialog disappearing too early

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
index 904cb1bb9..df7ea573f 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
@@ -97,6 +97,8 @@ public void onFailure(@NonNull Exception e) {
                         })
                         .addOnFailureListener(new TaskFailureLogger(TAG,
                                 "Error fetching providers for email"));
+
+                return;
             } else {
                 Log.e(TAG,
                       "Unexpected exception when signing in with credential "

From d9a2136ba813ff5bd4255d08dc53bad7fb590c46 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Fri, 22 Sep 2017 20:52:29 -0700
Subject: [PATCH 04/28] Properly bubble up intermediary load failures

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../auth/util/accountlink/ManualMergeUtils.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java
index 650fe0cca..a56588744 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java
@@ -43,29 +43,31 @@ public void onServiceDisconnected(ComponentName name) {}
         };
         bindService(activity, keepServiceAliveConnection);
 
-        return getLoadDataTask(activity, response)
+        return getLoadDataTask(activity)
                 .continueWithTask(new Continuation<Void, Task<T>>() {
                     @Override
                     public Task<T> then(@NonNull Task<Void> task) throws Exception {
+                        task.getResult();
                         return insertTask.call();
                     }
                 })
                 .continueWithTask(new Continuation<T, Task<T>>() {
                     @Override
-                    public Task<T> then(@NonNull Task<T> task) throws Exception {
+                    public Task<T> then(@NonNull Task<T> task) {
+                        task.getResult();
                         return getTransferDataTask(activity, response, task);
                     }
                 })
                 .continueWith(new Continuation<T, T>() {
                     @Override
-                    public T then(@NonNull Task<T> task) throws Exception {
+                    public T then(@NonNull Task<T> task) {
                         unbindService(activity, keepServiceAliveConnection);
                         return task.getResult();
                     }
                 });
     }
 
-    private static Task<Void> getLoadDataTask(HelperActivityBase activity, IdpResponse response) {
+    private static Task<Void> getLoadDataTask(HelperActivityBase activity) {
         return getDataTask(activity, new MergeServiceConnection() {
             @Override
             protected Task<Void> getDataTask(ManualMergeService service) {
@@ -84,7 +86,7 @@ protected Task<Void> getDataTask(ManualMergeService service) {
             }
         }).continueWith(new Continuation<Void, T>() {
             @Override
-            public T then(@NonNull Task<Void> task) throws Exception {
+            public T then(@NonNull Task<Void> task) {
                 return originalTask.getResult();
             }
         });
@@ -96,7 +98,7 @@ private static Task<Void> getDataTask(final HelperActivityBase activity,
         bindService(activity, connection.setTask(task));
         return task.getTask().continueWith(new Continuation<Void, Void>() {
             @Override
-            public Void then(@NonNull Task<Void> task) throws Exception {
+            public Void then(@NonNull Task<Void> task) {
                 unbindService(activity, connection);
                 return task.getResult();
             }
@@ -144,7 +146,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
 
             task.continueWith(new Continuation<Void, Void>() {
                 @Override
-                public Void then(@NonNull Task<Void> task) throws Exception {
+                public Void then(@NonNull Task<Void> task) {
                     mTask.setResult(null);
                     return null;
                 }

From 94a72954242de4828024712842579cf575a094e5 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Sun, 5 Nov 2017 00:01:23 -0700
Subject: [PATCH 05/28] Fix typo

---
 auth/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auth/README.md b/auth/README.md
index 4d340ec50..552e19691 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -366,7 +366,7 @@ their existing account so as not to forget why they came to your app in the firs
 great for users, but problematic for us developers: your user now has two different ids that match
 the same person! The above example isn't just limited to anonymous accounts; **anytime a user has
 two existing accounts, a user collision will occur and you will have to manually merge those
-accounts together**. To help you do this, FirebaseUI provides a service to guides you through to
+accounts together**. To help you do this, FirebaseUI provides a service to guide you through to
 process of loading and the transferring the user's data.
 
 The following is an example of how you would move data from the user's previous uid to their new one

From 22cf8d3d629c1a43c313b862db7f17634df9f886 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Thu, 14 Dec 2017 15:31:38 -0800
Subject: [PATCH 06/28] Fix merge mistakes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 auth/src/main/java/com/firebase/ui/auth/AuthUI.java         | 1 +
 .../ui/auth/ui/email/WelcomeBackPasswordPrompt.java         | 3 ++-
 .../firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java   | 1 +
 .../firebase/ui/auth/ui/idp/CredentialSignInHandler.java    | 2 ++
 .../com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java   | 1 +
 .../firebase/ui/auth/util/accountlink/AccountLinker.java    | 3 ++-
 .../ui/auth/util/signincontainer/IdpSignInContainer.java    | 2 ++
 .../ui/auth/util/signincontainer/SignInDelegate.java        | 6 ++++--
 8 files changed, 15 insertions(+), 4 deletions(-)

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 fa9ac8224..b387c9427 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -35,6 +35,7 @@
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.GoogleApiUtils;
 import com.firebase.ui.auth.util.Preconditions;
+import com.firebase.ui.auth.util.accountlink.ManualMergeService;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.auth.api.credentials.CredentialsClient;
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 ff483c3e4..30c21f92a 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
@@ -41,6 +41,7 @@
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.util.ExtraConstants;
+import com.firebase.ui.auth.util.accountlink.ManualMergeUtils;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.firebase.ui.auth.util.ui.ImeHelper;
@@ -167,7 +168,7 @@ private void validateAndSignIn(final String email, final String password) {
                 response,
                 new Callable<Task<AuthResult>>() {
                     @Override
-                    public Task<AuthResult> call() throws Exception {
+                    public Task<AuthResult> call() {
                         // Sign in with known email and the password provided
                         return getAuthHelper().getFirebaseAuth()
                                 .signInWithEmailAndPassword(email, password);
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 139f6055e..3b633a2c0 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
@@ -31,6 +31,7 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
+import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.provider.EmailProvider;
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
index eedbf0551..e90a6cf5b 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
@@ -27,7 +27,9 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.WelcomeBackPasswordPrompt;
+import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnCompleteListener;
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 4b60733de..70d000244 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
@@ -38,6 +38,7 @@
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
+import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.FacebookAuthProvider;
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
index 4bfc886f2..7f2010b92 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
@@ -8,6 +8,7 @@
 
 import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.google.android.gms.tasks.OnCompleteListener;
@@ -124,7 +125,7 @@ public void onFailure(@NonNull Exception e) {
                     mIdpResponse,
                     new Callable<Task<AuthResult>>() {
                         @Override
-                        public Task<AuthResult> call() throws Exception {
+                        public Task<AuthResult> call() {
                             return mActivity.getAuthHelper().getFirebaseAuth()
                                     .signInWithCredential(mExistingCredential)
                                     .continueWithTask(new ProfileMerger(mIdpResponse));
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
index 95d701d35..b4a895420 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
@@ -30,6 +30,7 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.User;
+import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
 import com.firebase.ui.auth.provider.IdpProvider;
@@ -41,6 +42,7 @@
 import com.firebase.ui.auth.ui.idp.CredentialSignInHandler;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.ProviderUtils;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FacebookAuthProvider;
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
index cf947fa78..90ee95f0a 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
@@ -18,6 +18,7 @@
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.User;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.EmailActivity;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
@@ -25,6 +26,7 @@
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.GoogleApiHelper;
 import com.firebase.ui.auth.util.GoogleSignInHelper;
+import com.firebase.ui.auth.util.accountlink.ManualMergeUtils;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.credentials.Credential;
@@ -119,7 +121,7 @@ public void onCreate(Bundle savedInstance) {
     }
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(@NonNull Bundle outState) {
         // It doesn't matter what we put here, we just don't want outState to be empty
         outState.putBoolean(ExtraConstants.HAS_EXISTING_INSTANCE, true);
         super.onSaveInstanceState(outState);
@@ -291,7 +293,7 @@ private void signInWithEmailAndPassword(final String email, final String passwor
                 response,
                 new Callable<Task<AuthResult>>() {
                     @Override
-                    public Task<AuthResult> call() throws Exception {
+                    public Task<AuthResult> call() {
                         return getAuthHelper().getFirebaseAuth()
                                 .signInWithEmailAndPassword(email, password);
                     }

From efb7a884a61b528032eb1386c064e69ed0ffb6c3 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Wed, 3 Jan 2018 20:35:06 -0800
Subject: [PATCH 07/28] Fix merge mistakes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../java/com/firebase/ui/auth/testhelpers/TestHelper.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 8333cdefc..6fcbd2184 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
@@ -177,8 +177,8 @@ public static FlowParameters getFlowParameters(List<String> providerIds) {
                 null,
                 true,
                 true,
-                null,
-                true);
+                true,
+                null);
     }
 
     public static void verifySmartLockSave(String providerId,

From 84bb271016ccac13a794b8dfe27ab3fe25efbae1 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Mon, 22 Jan 2018 16:35:35 -0800
Subject: [PATCH 08/28] Fix merge mistakes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../ui/email/WelcomeBackPasswordPrompt.java   |  3 +-
 .../auth/util/accountlink/AccountLinker.java  |  1 +
 .../util/accountlink/ManualMergeUtils.java    | 43 ++++++++++---------
 .../util/signincontainer/SignInDelegate.java  |  4 +-
 .../email/WelcomeBackPasswordHandler.java     | 27 +++++++++---
 .../WelcomeBackPasswordHandlerTest.java       |  9 ++--
 6 files changed, 54 insertions(+), 33 deletions(-)

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 89e3b18e9..83c98adc3 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
@@ -207,7 +207,8 @@ private void validateAndSignIn(final String email, final String password) {
         }
 
         AuthCredential authCredential = ProviderUtils.getAuthCredential(mIdpResponse);
-        mHandler.startSignIn(email, password, mIdpResponse, authCredential);
+        mHandler.startSignIn(email, password, mIdpResponse, authCredential,
+                getAuthHelper().getUidForAccountLinking());
     }
 
     @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
index 7f2010b92..ffdd271be 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
@@ -123,6 +123,7 @@ public void onFailure(@NonNull Exception e) {
             // current user, log them out, and then sign in with the new credential.
             Task<AuthResult> signInTask = ManualMergeUtils.injectSignInTaskBetweenDataTransfer(mActivity,
                     mIdpResponse,
+                    mActivity.getFlowParams(),
                     new Callable<Task<AuthResult>>() {
                         @Override
                         public Task<AuthResult> call() {
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java
index a56588744..6f851f4fb 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/ManualMergeUtils.java
@@ -10,7 +10,7 @@
 import android.support.annotation.Nullable;
 
 import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.data.model.FlowParameters;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -24,11 +24,11 @@ private ManualMergeUtils() {
     }
 
     public static <T> Task<T> injectSignInTaskBetweenDataTransfer(
-            final HelperActivityBase activity,
+            final Context context,
             final IdpResponse response,
+            final FlowParameters params,
             final Callable<Task<T>> insertTask) {
-        if (response.getUser().getPrevUid() == null
-                || activity.getFlowParams().accountLinkingListener == null) try {
+        if (response.getUser().getPrevUid() == null || params.accountLinkingListener == null) try {
             return insertTask.call();
         } catch (Exception e) {
             throw new IllegalStateException(e);
@@ -41,9 +41,9 @@ public void onServiceConnected(ComponentName name, IBinder service) {}
             @Override
             public void onServiceDisconnected(ComponentName name) {}
         };
-        bindService(activity, keepServiceAliveConnection);
+        bindService(context, params, keepServiceAliveConnection);
 
-        return getLoadDataTask(activity)
+        return getLoadDataTask(context, params)
                 .continueWithTask(new Continuation<Void, Task<T>>() {
                     @Override
                     public Task<T> then(@NonNull Task<Void> task) throws Exception {
@@ -55,20 +55,20 @@ public Task<T> then(@NonNull Task<Void> task) throws Exception {
                     @Override
                     public Task<T> then(@NonNull Task<T> task) {
                         task.getResult();
-                        return getTransferDataTask(activity, response, task);
+                        return getTransferDataTask(context, response, params, task);
                     }
                 })
                 .continueWith(new Continuation<T, T>() {
                     @Override
                     public T then(@NonNull Task<T> task) {
-                        unbindService(activity, keepServiceAliveConnection);
+                        unbindService(context, keepServiceAliveConnection);
                         return task.getResult();
                     }
                 });
     }
 
-    private static Task<Void> getLoadDataTask(HelperActivityBase activity) {
-        return getDataTask(activity, new MergeServiceConnection() {
+    private static Task<Void> getLoadDataTask(Context context, FlowParameters params) {
+        return getDataTask(context, params, new MergeServiceConnection() {
             @Override
             protected Task<Void> getDataTask(ManualMergeService service) {
                 return service.onLoadData();
@@ -76,10 +76,11 @@ protected Task<Void> getDataTask(ManualMergeService service) {
         });
     }
 
-    private static <T> Task<T> getTransferDataTask(HelperActivityBase activity,
+    private static <T> Task<T> getTransferDataTask(Context context,
                                                    final IdpResponse response,
+                                                   final FlowParameters params,
                                                    final Task<T> originalTask) {
-        return getDataTask(activity, new MergeServiceConnection() {
+        return getDataTask(context, params, new MergeServiceConnection() {
             @Override
             protected Task<Void> getDataTask(ManualMergeService service) {
                 return service.onTransferData(response);
@@ -92,30 +93,32 @@ public T then(@NonNull Task<Void> task) {
         });
     }
 
-    private static Task<Void> getDataTask(final HelperActivityBase activity,
+    private static Task<Void> getDataTask(final Context context,
+                                          final FlowParameters params,
                                           final MergeServiceConnection connection) {
         TaskCompletionSource<Void> task = new TaskCompletionSource<>();
-        bindService(activity, connection.setTask(task));
+        bindService(context, params, connection.setTask(task));
         return task.getTask().continueWith(new Continuation<Void, Void>() {
             @Override
             public Void then(@NonNull Task<Void> task) {
-                unbindService(activity, connection);
+                unbindService(context, connection);
                 return task.getResult();
             }
         });
     }
 
-    private static void bindService(HelperActivityBase activity,
+    private static void bindService(Context context,
+                                    FlowParameters params,
                                     ServiceConnection connection) {
-        Context appContext = activity.getApplicationContext();
+        Context appContext = context.getApplicationContext();
         appContext.bindService(
-                new Intent(appContext, activity.getFlowParams().accountLinkingListener),
+                new Intent(appContext, params.accountLinkingListener),
                 connection,
                 Context.BIND_AUTO_CREATE);
     }
 
-    private static void unbindService(HelperActivityBase activity, ServiceConnection connection) {
-        activity.getApplicationContext().unbindService(connection);
+    private static void unbindService(Context context, ServiceConnection connection) {
+        context.getApplicationContext().unbindService(connection);
     }
 
     public static final class MergeBinder extends Binder {
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
index 0881bed3b..d106e551c 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
@@ -17,7 +17,6 @@
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.User;
-import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.EmailActivity;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
@@ -272,8 +271,9 @@ private void signInWithEmailAndPassword(final String email, final String passwor
                         .setPrevUid(getAuthHelper().getUidForAccountLinking())
                         .build()).build();
 
-        ManualMergeUtils.injectSignInTaskBetweenDataTransfer((HelperActivityBase) getActivity(),
+        ManualMergeUtils.injectSignInTaskBetweenDataTransfer(getActivity(),
                 response,
+                getFlowParams(),
                 new Callable<Task<AuthResult>>() {
                     @Override
                     public Task<AuthResult> call() {
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 629ae3e67..4cb04bc46 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
@@ -17,6 +17,7 @@
 import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.util.CredentialsUtil;
+import com.firebase.ui.auth.util.accountlink.ManualMergeUtils;
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
 import com.firebase.ui.auth.viewmodel.PendingResolution;
 import com.firebase.ui.auth.viewmodel.SingleLiveEvent;
@@ -31,6 +32,8 @@
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseUser;
 
+import java.util.concurrent.Callable;
+
 /**
  * Handles the logic for {@link com.firebase.ui.auth.ui.email.WelcomeBackPasswordPrompt} including
  * signing in with email and password, linking other credentials, and saving credentials to
@@ -58,25 +61,35 @@ public WelcomeBackPasswordHandler(Application application) {
     public void startSignIn(@NonNull final String email,
                             @NonNull final String password,
                             @NonNull final IdpResponse inputResponse,
-                            @Nullable final AuthCredential credential) {
+                            @Nullable final AuthCredential credential,
+                            @Nullable final String prevUid) {
         mSignInLiveData.setValue(new Resource<IdpResponse>());
 
         // Build appropriate IDP response based on inputs
         final IdpResponse outputResponse;
         if (credential == null) {
             outputResponse = new IdpResponse.Builder(
-                    new User.Builder(EmailAuthProvider.PROVIDER_ID, email).build())
+                    new User.Builder(EmailAuthProvider.PROVIDER_ID, email)
+                            .setPrevUid(prevUid).build())
                     .build();
         } else {
             outputResponse = new IdpResponse.Builder(inputResponse.getUser())
                     .setToken(inputResponse.getIdpToken())
                     .setSecret(inputResponse.getIdpSecret())
                     .build();
+            outputResponse.getUser().setPrevUid(prevUid);
         }
 
-        // Kick off the flow including signing in, linking accounts, and saving with SmartLock
-        getAuth().signInWithEmailAndPassword(email, password)
-                .addOnFailureListener(new TaskFailureLogger(TAG, "signInWithEmailAndPassword failed."))
+        ManualMergeUtils.injectSignInTaskBetweenDataTransfer(getApplication(),
+                outputResponse,
+                getArguments(),
+                new Callable<Task<AuthResult>>() {
+                    @Override
+                    public Task<AuthResult> call() {
+                        // Sign in with known email and the password provided
+                        return getAuth().signInWithEmailAndPassword(email, password);
+                    }
+                })
                 .continueWithTask(new Continuation<AuthResult, Task<AuthResult>>() {
                     @Override
                     public Task<AuthResult> then(@NonNull Task<AuthResult> task) throws Exception {
@@ -90,7 +103,9 @@ public Task<AuthResult> then(@NonNull Task<AuthResult> task) throws Exception {
                             return result.getUser()
                                     .linkWithCredential(credential)
                                     .continueWithTask(new ProfileMerger(outputResponse))
-                                    .addOnFailureListener(new TaskFailureLogger(TAG, "linkWithCredential+merge failed."));
+                                    .addOnFailureListener(new TaskFailureLogger(
+                                            TAG, "Error signing in with credential " +
+                                            credential.getProvider()));
                         }
                     }
                 })
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 8f2824349..373a6cc60 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
@@ -80,7 +80,7 @@ public void testSignIn_signsInAndSavesCredentials() {
                 .thenReturn(AutoCompleteTask.<Void>forSuccess(null));
 
         // Kick off the sign in flow
-        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, null, null);
+        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, null, null, null);
 
         // Verify that we get a loading event
         verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
@@ -132,7 +132,8 @@ public void testSignIn_linksIdpCredential() {
                 .thenReturn(AutoCompleteTask.<Void>forSuccess(null));
 
         // Kick off the sign in flow
-        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, response, credential);
+        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, response, credential,
+                null);
 
         // Verify that we get a loading event
         verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
@@ -157,7 +158,7 @@ public void testSignIn_propagatesFailure() {
                 .thenReturn(AutoContinueTask.<AuthResult>forFailure(new Exception("FAILED")));
 
         // Kick off the sign in flow
-        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, null, null);
+        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, null, null, null);
 
         // Verify that we get a loading event
         verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
@@ -186,7 +187,7 @@ public void testSignIn_handlesResolution() {
                 .thenReturn(AutoCompleteTask.<Void>forFailure(mockRae));
 
         // Kick off the sign in flow
-        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, null, null);
+        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, null, null, null);
 
         // Make sure we get a resolution
         ArgumentCaptor<PendingResolution> resolveCaptor = ArgumentCaptor.forClass(PendingResolution.class);

From 6f5f42d07f850685aeb24f0f1d2fc3fbe4fdc6af Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Mon, 22 Jan 2018 17:05:20 -0800
Subject: [PATCH 09/28] Mmm

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../com/firebase/ui/auth/testhelpers/TestHelper.java     | 9 +++------
 .../com/firebase/ui/auth/ui/email/EmailActivityTest.java | 3 +--
 .../ui/auth/ui/idp/AuthMethodPickerActivityTest.java     | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

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 eef80aa11..9a4153b17 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
@@ -198,15 +198,13 @@ public static void mockCredentialsClient(HelperActivityBase activity) {
     }
 
     public static void verifySmartLockSave(HelperActivityBase activity,
-                                           String providerId, String email, String password,
-                                           String accountLinkingUid) {
-        verifySmartLockSave(activity, providerId, email, password, null, accountLinkingUid);
+                                           String providerId, String email, String password) {
+        verifySmartLockSave(activity, providerId, email, password, null);
     }
 
     public static void verifySmartLockSave(HelperActivityBase activity,
                                            String providerId, String email,
-                                           String password, String phoneNumber,
-                                           String accountLinkingUid) {
+                                           String password, String phoneNumber) {
 
         SaveSmartLock saveSmartLock = SaveSmartLock.getInstance(activity);
         CredentialsClient mockCredentials = saveSmartLock.getCredentialsClient();
@@ -222,7 +220,6 @@ public static void verifySmartLockSave(HelperActivityBase activity,
             assertEquals(credential.getAccountType(),
                     ProviderUtils.providerIdToAccountType(providerId));
         }
-        assertEquals(accountLinkingUid, idpResponseCaptor.getValue().getPrevUid());
 
         // ID can either be email or phone number
         if (!TextUtils.isEmpty(phoneNumber)) {
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/EmailActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/EmailActivityTest.java
index 368ce3ed4..7b36e6d47 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/EmailActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/EmailActivityTest.java
@@ -136,7 +136,6 @@ public void testSignUpButton_successfulRegistrationShouldContinueToSaveCredentia
         TestHelper.verifySmartLockSave(emailActivity,
                 EmailAuthProvider.PROVIDER_ID,
                 TestConstants.EMAIL,
-                TestConstants.PASSWORD,
-                null);
+                TestConstants.PASSWORD);
     }
 }
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 8ea181031..59c6938cc 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
@@ -141,7 +141,7 @@ public void testFacebookLoginFlow() {
         facebookButton.performClick();
 
         verifySmartLockSave(authMethodPickerActivity,
-                FacebookAuthProvider.PROVIDER_ID, TestConstants.EMAIL, null, null);
+                FacebookAuthProvider.PROVIDER_ID, TestConstants.EMAIL, null);
     }
 
     @Test
@@ -165,7 +165,7 @@ public void testGoogleLoginFlow() {
         googleButton.performClick();
 
         verifySmartLockSave(authMethodPickerActivity,
-                GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL, null, null);
+                GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL, null);
     }
 
     @Test

From e2e24580c569d24282310cdaea65c0408692a395 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Tue, 13 Feb 2018 17:56:14 -0800
Subject: [PATCH 10/28] Support 2-way linking for phone auth

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../auth/ui/idp/CredentialSignInHandler.java  |  15 +-
 .../ui/auth/ui/idp/WelcomeBackIdpPrompt.java  |  21 +-
 .../ui/auth/ui/phone/PhoneActivity.java       |  98 +++++++--
 .../phone/SubmitConfirmationCodeFragment.java |  11 +-
 .../auth/util/accountlink/AccountLinker.java  | 202 ++++++++----------
 5 files changed, 209 insertions(+), 138 deletions(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
index d230fedd3..a5365c0d8 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
@@ -115,7 +115,20 @@ public void onSuccess(ProviderQueryResult result) {
                 // We don't want to show the welcome back dialog since the user selected
                 // an existing account and we can just link the two accounts without knowing
                 // prevCredential.
-                AccountLinker.linkWithCurrentUser(mActivity, mResponse, credential);
+                AccountLinker.linkWithCurrentUser(mActivity, mResponse, credential)
+                        .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
+                            @Override
+                            public void onSuccess(AuthResult result) {
+                                mActivity.finish(Activity.RESULT_OK, mResponse.toIntent());
+                            }
+                        })
+                        .addOnFailureListener(new OnFailureListener() {
+                            @Override
+                            public void onFailure(@NonNull Exception e) {
+                                mActivity.finish(Activity.RESULT_CANCELED,
+                                        IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
+                            }
+                        });
                 return;
             }
             mActivity.getDialogHolder().dismissDialog();
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 70d000244..8ed740771 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
@@ -17,6 +17,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.util.Log;
@@ -40,7 +41,10 @@
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.util.data.ProviderUtils;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
@@ -129,14 +133,25 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     @Override
-    public void onSuccess(IdpResponse idpResponse) {
+    public void onSuccess(final IdpResponse idpResponse) {
         AuthCredential newCredential = ProviderUtils.getAuthCredential(idpResponse);
         if (newCredential == null) {
             Log.e(TAG, "No credential returned");
             finish(RESULT_CANCELED, IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
         } else {
-            AccountLinker.linkToNewUser(
-                    this, idpResponse, newCredential, mPrevCredential);
+            AccountLinker.linkToNewUser(this, idpResponse, newCredential, mPrevCredential)
+                    .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
+                        @Override
+                        public void onSuccess(AuthResult result) {
+                            finish(RESULT_OK, idpResponse.toIntent());
+                        }
+                    })
+                    .addOnFailureListener(new OnFailureListener() {
+                        @Override
+                        public void onFailure(@NonNull Exception e) {
+                            WelcomeBackIdpPrompt.this.onFailure();
+                        }
+                    });
         }
     }
 
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 d0b7a1ad6..de0a1d548 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
@@ -26,15 +26,20 @@
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.Log;
+import android.widget.Toast;
 
+import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.User;
+import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.FirebaseAuthError;
+import com.firebase.ui.auth.util.accountlink.AccountLinker;
+import com.firebase.ui.auth.util.accountlink.ManualMergeUtils;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
@@ -42,10 +47,11 @@
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuthException;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
-import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.PhoneAuthCredential;
 import com.google.firebase.auth.PhoneAuthProvider;
 
+import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -75,6 +81,8 @@ private enum VerificationState {
     private PhoneAuthProvider.ForceResendingToken mForceResendingToken;
     private VerificationState mVerificationState;
 
+    private boolean mIsWaitingForAnonymousLink;
+
     public static Intent createIntent(Context context, FlowParameters flowParams, Bundle params) {
         return HelperActivityBase.createBaseIntent(
                 context, PhoneActivity.class, flowParams)
@@ -121,7 +129,12 @@ protected void onStart() {
             sendCode(mPhoneNumber, false);
         } else if (mVerificationState == VerificationState.VERIFIED) {
             // activity was recreated when verified dialog was displayed
-            finish(getAuthHelper().getCurrentUser());
+            IdpResponse response = new IdpResponse.Builder(
+                    new User.Builder(PhoneAuthProvider.PROVIDER_ID, null)
+                            .setPhoneNumber(getAuthHelper().getCurrentUser().getPhoneNumber())
+                            .build())
+                    .build();
+            finish(RESULT_OK, response.toIntent());
         }
     }
 
@@ -159,7 +172,7 @@ void verifyPhoneNumber(String phoneNumber, boolean forceResend) {
         }
     }
 
-    public void submitConfirmationCode(@NonNull String confirmationCode) {
+    public void submitConfirmationCode(String phoneNumber, @NonNull String confirmationCode) {
         if (TextUtils.isEmpty(mVerificationId) || TextUtils.isEmpty(confirmationCode)) {
             // This situation should never happen except in the case of an extreme race
             // condition, so we will just ignore the submission.
@@ -172,12 +185,13 @@ public void submitConfirmationCode(@NonNull String confirmationCode) {
         }
 
         showLoadingDialog(getString(R.string.fui_verifying));
-        signIn(PhoneAuthProvider.getCredential(mVerificationId, confirmationCode));
+        signIn(phoneNumber, PhoneAuthProvider.getCredential(mVerificationId, confirmationCode));
     }
 
-    private void onVerificationSuccess(@NonNull final PhoneAuthCredential phoneAuthCredential) {
+    private void onVerificationSuccess(String phoneNumber,
+                                       @NonNull final PhoneAuthCredential phoneAuthCredential) {
         if (TextUtils.isEmpty(phoneAuthCredential.getSmsCode())) {
-            signIn(phoneAuthCredential);
+            signIn(phoneNumber, phoneAuthCredential);
         } else {
             //Show Fragment if it is not already visible
             showSubmitCodeFragment();
@@ -190,7 +204,7 @@ private void onVerificationSuccess(@NonNull final PhoneAuthCredential phoneAuthC
                 submitConfirmationCodeFragment.setConfirmationCode(String.valueOf
                         (phoneAuthCredential.getSmsCode()));
             }
-            signIn(phoneAuthCredential);
+            signIn(phoneNumber, phoneAuthCredential);
         }
     }
 
@@ -237,7 +251,7 @@ private void onVerificationFailed(@NonNull FirebaseException ex) {
         }
     }
 
-    private void sendCode(String phoneNumber, boolean forceResend) {
+    private void sendCode(final String phoneNumber, boolean forceResend) {
         mPhoneNumber = phoneNumber;
         mVerificationState = VerificationState.VERIFICATION_STARTED;
 
@@ -250,7 +264,8 @@ private void sendCode(String phoneNumber, boolean forceResend) {
                     @Override
                     public void onVerificationCompleted(@NonNull PhoneAuthCredential phoneAuthCredential) {
                         if (!mIsDestroyed) {
-                            PhoneActivity.this.onVerificationSuccess(phoneAuthCredential);
+                            PhoneActivity.this.onVerificationSuccess(phoneNumber,
+                                    phoneAuthCredential);
                         }
                     }
 
@@ -297,15 +312,6 @@ private void showSubmitCodeFragment() {
         }
     }
 
-    private void finish(FirebaseUser user) {
-        IdpResponse response = new IdpResponse.Builder(
-                new User.Builder(PhoneAuthProvider.PROVIDER_ID, null)
-                        .setPhoneNumber(user.getPhoneNumber())
-                        .build())
-                .build();
-        finish(RESULT_OK, response.toIntent());
-    }
-
     private void showAlertDialog(@NonNull String s, DialogInterface.OnClickListener
             onClickListener) {
         mAlertDialog = new AlertDialog.Builder(this)
@@ -314,10 +320,46 @@ private void showAlertDialog(@NonNull String s, DialogInterface.OnClickListener
                 .show();
     }
 
-    private void signIn(@NonNull PhoneAuthCredential credential) {
+    private void signIn(final String phoneNumber, @NonNull final PhoneAuthCredential credential) {
+        final IdpResponse response = new IdpResponse.Builder(
+                new User.Builder(PhoneAuthProvider.PROVIDER_ID, null)
+                        .setPhoneNumber(phoneNumber)
+                        .build())
+                .build();
+
+        if (mIsWaitingForAnonymousLink) {
+            response.getUser().setPrevUid(getAuthHelper().getUidForAccountLinking());
+            ManualMergeUtils.injectSignInTaskBetweenDataTransfer(
+                    this,
+                    response,
+                    getFlowParams(),
+                    new Callable<Task<AuthResult>>() {
+                        @Override
+                        public Task<AuthResult> call() {
+                            return getAuthHelper().getFirebaseAuth()
+                                    .signInWithCredential(credential)
+                                    .continueWithTask(new ProfileMerger(response))
+                                    .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
+                                        @Override
+                                        public void onSuccess(AuthResult result) {
+                                            finish(RESULT_OK, response.toIntent());
+                                        }
+                                    })
+                                    .addOnFailureListener(new OnFailureListener() {
+                                        @Override
+                                        public void onFailure(@NonNull Exception e) {
+                                            finish(RESULT_CANCELED, IdpResponse.getErrorCodeIntent(
+                                                    ErrorCodes.UNKNOWN_ERROR));
+                                        }
+                                    });
+                        }
+                    });
+            return;
+        }
+
         Task<AuthResult> signInTask;
         if (getAuthHelper().canLinkAccounts()) {
-            signInTask = getAuthHelper().getCurrentUser().linkWithCredential(credential);
+            signInTask = AccountLinker.linkWithCurrentUser(this, response, credential);
         } else {
             signInTask = getAuthHelper().getFirebaseAuth().signInWithCredential(credential);
         }
@@ -334,7 +376,7 @@ public void onSuccess(final AuthResult authResult) {
                     public void run() {
                         if (!mIsDestroyed) {
                             dismissLoadingDialog();
-                            finish(authResult.getUser());
+                            finish(RESULT_OK, response.toIntent());
                         }
                     }
                 }, SHORT_DELAY_MILLIS);
@@ -344,7 +386,19 @@ public void run() {
             public void onFailure(@NonNull Exception e) {
                 dismissLoadingDialog();
                 //incorrect confirmation code
-                if (e instanceof FirebaseAuthInvalidCredentialsException) {
+                if (e.getCause() instanceof FirebaseAuthUserCollisionException
+                        && getAuthHelper().canLinkAccounts()) {
+                    mIsWaitingForAnonymousLink = true;
+                    // Apparently, you can't use the same phone credential twice so we need to copy
+                    // this from AccountLinker.linkWithCurrentUser.
+                    sendCode(phoneNumber, true);
+                    getSubmitConfirmationCodeFragment().setConfirmationCode("");
+                    Toast.makeText(
+                            PhoneActivity.this,
+                            FirebaseAuthError.ERROR_SESSION_EXPIRED.getDescription(),
+                            Toast.LENGTH_LONG
+                    ).show();
+                } else if (e instanceof FirebaseAuthInvalidCredentialsException) {
                     FirebaseAuthError error = FirebaseAuthError.fromException(
                             (FirebaseAuthInvalidCredentialsException) e);
 
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 f87640101..22746ea74 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
@@ -48,6 +48,8 @@ public class SubmitConfirmationCodeFragment extends FragmentBase {
     private static final long RESEND_WAIT_MILLIS = 15000;
     private static final String EXTRA_MILLIS_UNTIL_FINISHED = "EXTRA_MILLIS_UNTIL_FINISHED";
 
+    private String mPhoneNumber;
+
     private TextView mEditPhoneTextView;
     private TextView mResendCodeTextView;
     private TextView mCountDownTextView;
@@ -84,14 +86,14 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         mSubmitConfirmationButton = v.findViewById(R.id.submit_confirmation_code);
         mAgreementText = v.findViewById(R.id.create_account_tos);
 
-        final String phoneNumber = getArguments().getString(ExtraConstants.EXTRA_PHONE);
+        mPhoneNumber = getArguments().getString(ExtraConstants.EXTRA_PHONE);
 
         parentActivity.setTitle(getString(R.string.fui_verify_your_phone_title));
         setupConfirmationCodeEditText();
-        setupEditPhoneNumberTextView(phoneNumber);
+        setupEditPhoneNumberTextView(mPhoneNumber);
         setupCountDown(RESEND_WAIT_MILLIS);
         setupSubmitConfirmationCodeButton();
-        setupResendConfirmationCodeTextView(phoneNumber);
+        setupResendConfirmationCodeTextView(mPhoneNumber);
         setUpTermsOfService();
         return v;
     }
@@ -174,7 +176,8 @@ public void onClick(View v) {
     }
 
     private void submitConfirmationCode() {
-        mVerifier.submitConfirmationCode(mConfirmationCodeEditText.getUnspacedText().toString());
+        mVerifier.submitConfirmationCode(
+                mPhoneNumber, mConfirmationCodeEditText.getUnspacedText().toString());
     }
 
     private void setupEditPhoneNumberTextView(@Nullable String phoneNumber) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
index ffdd271be..ab36f3050 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
@@ -1,20 +1,16 @@
 package com.firebase.ui.auth.util.accountlink;
 
-import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
-import android.util.Log;
 
-import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
@@ -30,7 +26,7 @@
  * Facebook are linked and the uid of the anonymous account is returned for manual merging.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class AccountLinker implements OnSuccessListener<AuthResult>, OnFailureListener {
+public final class AccountLinker {
     private static final String TAG = "AccountLinker";
 
     private final HelperActivityBase mActivity;
@@ -42,6 +38,8 @@ public class AccountLinker implements OnSuccessListener<AuthResult>, OnFailureLi
     /** The credential the user originally tried to sign in with. */
     @Nullable private final AuthCredential mNewCredential;
 
+    private final Task<AuthResult> mTask;
+
     private AccountLinker(HelperActivityBase activity,
                           IdpResponse response,
                           @NonNull AuthCredential existingCredential,
@@ -51,141 +49,129 @@ private AccountLinker(HelperActivityBase activity,
         mExistingCredential = existingCredential;
         mNewCredential = newCredential;
 
-        start();
+        mTask = start();
     }
 
-    public static void linkWithCurrentUser(HelperActivityBase activity,
-                                           IdpResponse response,
-                                           AuthCredential existingCredential) {
-        new AccountLinker(activity, response, existingCredential, null);
+    public static Task<AuthResult> linkWithCurrentUser(HelperActivityBase activity,
+                                                       IdpResponse response,
+                                                       AuthCredential existingCredential) {
+        return new AccountLinker(activity, response, existingCredential, null).mTask;
     }
 
-    public static void linkToNewUser(HelperActivityBase activity,
-                                     IdpResponse response,
-                                     AuthCredential existingCredential,
-                                     AuthCredential newCredential) {
-        new AccountLinker(activity, response, existingCredential, newCredential);
+    public static Task<AuthResult> linkToNewUser(HelperActivityBase activity,
+                                                 IdpResponse response,
+                                                 AuthCredential existingCredential,
+                                                 AuthCredential newCredential) {
+        return new AccountLinker(activity, response, existingCredential, newCredential).mTask;
     }
 
-    private void start() {
+    private Task<AuthResult> start() {
         FirebaseUser currentUser = mActivity.getAuthHelper().getCurrentUser();
         if (currentUser == null) {
             // The user has an existing account and is trying to log in with a new provider
-            mActivity.getAuthHelper().getFirebaseAuth()
+            return mActivity.getAuthHelper().getFirebaseAuth()
                     .signInWithCredential(mExistingCredential)
-                    .addOnSuccessListener(this)
-                    .addOnFailureListener(new OnFailureListener() {
-                        @Override
-                        public void onFailure(@NonNull Exception e) {
-                            finishWithError();
-                        }
-                    })
+                    .continueWithTask(new NoCurrentUser())
                     .addOnFailureListener(
                             new TaskFailureLogger(TAG, "Error signing in with new credential"));
         } else {
             // If the current user is trying to sign in with a new account, just link the two
             // and we should be fine. Otherwise, we are probably working with an anonymous account
             // trying to be linked to an existing account which is bound to fail.
-            currentUser
+            return currentUser
                     .linkWithCredential(mNewCredential == null ? mExistingCredential : mNewCredential)
                     .continueWithTask(new ProfileMerger(mIdpResponse))
-                    .addOnSuccessListener(new FinishListener())
-                    .addOnFailureListener(this)
+                    .continueWithTask(new ExistingUser())
                     .addOnFailureListener(
                             new TaskFailureLogger(TAG, "Error linking with credential"));
         }
     }
 
-    @Override
-    public void onSuccess(AuthResult result) {
-        if (mNewCredential == null) {
-            mActivity.finish(Activity.RESULT_OK, mIdpResponse.toIntent());
-        } else {
-            // Link the user's existing account (mExistingCredential) with the account they were
-            // trying to sign in to (mNewCredential)
-            result.getUser()
-                    .linkWithCredential(mNewCredential)
-                    .continueWithTask(new ProfileMerger(mIdpResponse))
-                    .addOnFailureListener(new TaskFailureLogger(
-                            TAG, "Error signing in with previous credential"))
-                    .addOnCompleteListener(new FinishListener());
+    private final class NoCurrentUser implements Continuation<AuthResult, Task<AuthResult>> {
+        @Override
+        public Task<AuthResult> then(@NonNull Task<AuthResult> task) {
+            if (mNewCredential == null) {
+                return task;
+            } else {
+                // Link the user's existing account (mExistingCredential) with the account they were
+                // trying to sign in to (mNewCredential)
+                return task.getResult().getUser()
+                        .linkWithCredential(mNewCredential)
+                        .continueWithTask(new ProfileMerger(mIdpResponse))
+                        .addOnFailureListener(new TaskFailureLogger(
+                                TAG, "Error signing in with previous credential"));
+            }
         }
     }
 
-    @Override
-    public void onFailure(@NonNull Exception e) {
-        if (e instanceof FirebaseAuthUserCollisionException
-                && mActivity.getAuthHelper().canLinkAccounts()) {
-            mIdpResponse.getUser().setPrevUid(mActivity.getAuthHelper().getUidForAccountLinking());
-
-            // Since we still want the user to be able to sign in even though
-            // they have an existing account, we are going to save the uid of the
-            // current user, log them out, and then sign in with the new credential.
-            Task<AuthResult> signInTask = ManualMergeUtils.injectSignInTaskBetweenDataTransfer(mActivity,
-                    mIdpResponse,
-                    mActivity.getFlowParams(),
-                    new Callable<Task<AuthResult>>() {
-                        @Override
-                        public Task<AuthResult> call() {
-                            return mActivity.getAuthHelper().getFirebaseAuth()
-                                    .signInWithCredential(mExistingCredential)
-                                    .continueWithTask(new ProfileMerger(mIdpResponse));
-                        }
-                    })
-                    .addOnFailureListener(new OnFailureListener() {
+    private final class ExistingUser implements Continuation<AuthResult, Task<AuthResult>> {
+        @Override
+        public Task<AuthResult> then(@NonNull final Task<AuthResult> task) {
+            if (task.getException() instanceof FirebaseAuthUserCollisionException
+                    && mActivity.getAuthHelper().canLinkAccounts()) {
+                mIdpResponse.getUser()
+                        .setPrevUid(mActivity.getAuthHelper().getUidForAccountLinking());
+
+                // Since we still want the user to be able to sign in even though
+                // they have an existing account, we are going to save the uid of the
+                // current user, log them out, and then sign in with the new credential.
+                Task<AuthResult> signInTask = ManualMergeUtils.injectSignInTaskBetweenDataTransfer(
+                        mActivity,
+                        mIdpResponse,
+                        mActivity.getFlowParams(),
+                        new Callable<Task<AuthResult>>() {
+                            @Override
+                            public Task<AuthResult> call() {
+                                return mActivity.getAuthHelper().getFirebaseAuth()
+                                        .signInWithCredential(mExistingCredential)
+                                        .continueWithTask(new ProfileMerger(mIdpResponse))
+                                        .continueWithTask(new ExceptionWrapper(task));
+                            }
+                        })
+                        .addOnFailureListener(
+                                new TaskFailureLogger(TAG, "Error signing in with credential"));
+
+                // Occurs when the user is logged and they are trying to sign in with an existing account.
+                if (mNewCredential == null) {
+                    return signInTask;
+                } else {
+                    // 3 way account linking!!!
+                    // Occurs if the user is logged, trying to sign in with a new provider,
+                    // and already has existing providers.
+                    return signInTask.continueWithTask(new Continuation<AuthResult, Task<AuthResult>>() {
                         @Override
-                        public void onFailure(@NonNull Exception e) {
-                            finishWithError();
+                        public Task<AuthResult> then(@NonNull Task<AuthResult> task) {
+                            return mActivity.getAuthHelper().getCurrentUser()
+                                    .linkWithCredential(mNewCredential)
+                                    .continueWithTask(new ProfileMerger(mIdpResponse))
+                                    .continueWithTask(new ExceptionWrapper(task))
+                                    .addOnFailureListener(
+                                            new TaskFailureLogger(TAG,
+                                                    "Error linking with credential"));
                         }
-                    })
-                    .addOnFailureListener(
-                            new TaskFailureLogger(TAG, "Error signing in with credential"));
-
-            // Occurs when the user is logged and they are trying to sign in with an existing account.
-            if (mNewCredential == null) {
-                signInTask.addOnSuccessListener(new FinishListener());
+                    });
+                }
             } else {
-                // 3 way account linking!!!
-                // Occurs if the user is logged, trying to sign in with a new provider,
-                // and already has existing providers.
-                signInTask.addOnSuccessListener(new OnSuccessListener<AuthResult>() {
-                    @Override
-                    public void onSuccess(AuthResult result) {
-                        mActivity.getAuthHelper().getCurrentUser()
-                                .linkWithCredential(mNewCredential)
-                                .continueWithTask(new ProfileMerger(mIdpResponse))
-                                .addOnFailureListener(
-                                        new TaskFailureLogger(TAG, "Error linking with credential"))
-                                .addOnCompleteListener(new FinishListener());
-                    }
-                });
+                return task;
             }
-        } else {
-            Log.w(TAG, "See AuthUI.SignInIntentBuilder#setIsAccountLinkingEnabled(boolean, Class)"
-                    + " to support account linking");
-            finishWithError();
         }
-    }
-
-    private void finishWithError() {
-        mActivity.finish(
-                Activity.RESULT_CANCELED,
-                IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
-    }
 
-    private class FinishListener implements OnCompleteListener<AuthResult>, OnSuccessListener<AuthResult> {
-        @Override
-        public void onComplete(@NonNull Task task) {
-            finishOk();
-        }
+        private final class ExceptionWrapper implements Continuation<AuthResult, Task<AuthResult>> {
+            private final Task<AuthResult> mWrapped;
 
-        @Override
-        public void onSuccess(AuthResult result) {
-            finishOk();
-        }
+            public ExceptionWrapper(Task<AuthResult> wrapped) {
+                mWrapped = wrapped;
+            }
 
-        private void finishOk() {
-            mActivity.finish(Activity.RESULT_OK, mIdpResponse.toIntent());
+            @Override
+            public Task<AuthResult> then(@NonNull Task<AuthResult> task) {
+                try {
+                    task.getResult(Exception.class);
+                    return task;
+                } catch (Exception e) {
+                    return Tasks.forException((Exception) e.initCause(mWrapped.getException()));
+                }
+            }
         }
     }
 }

From d717e7d36e9bed761db5f9ad18f29e9a2b9f4e19 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Sat, 10 Mar 2018 23:01:42 -0800
Subject: [PATCH 11/28] Fix merge mistakes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../firebase/ui/auth/ui/idp/CredentialSignInHandler.java    | 6 ++----
 .../com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java   | 1 +
 .../java/com/firebase/ui/auth/ui/phone/PhoneActivity.java   | 4 +---
 .../ui/auth/viewmodel/email/WelcomeBackPasswordHandler.java | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
index e76b2f3b7..ae6b9e0c5 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
@@ -22,7 +22,6 @@
 import android.util.Log;
 
 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.User;
 import com.firebase.ui.auth.ui.HelperActivityBase;
@@ -32,14 +31,13 @@
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.auth.AuthCredential;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 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.FirebaseAuthUserCollisionException;
-import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.ProviderQueryResult;
 
 import java.util.List;
@@ -123,7 +121,7 @@ public void onSuccess(AuthResult result) {
                             @Override
                             public void onFailure(@NonNull Exception e) {
                                 mActivity.finish(Activity.RESULT_CANCELED,
-                                        IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
+                                        IdpResponse.getErrorIntent(e));
                             }
                         });
                 return;
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 34603ac74..22d019ba7 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
@@ -23,6 +23,7 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.ErrorCodes;
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 68b5dc409..0dee6a59e 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
@@ -29,7 +29,6 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
@@ -350,8 +349,7 @@ public void onSuccess(AuthResult result) {
                                     .addOnFailureListener(new OnFailureListener() {
                                         @Override
                                         public void onFailure(@NonNull Exception e) {
-                                            finish(RESULT_CANCELED, IdpResponse.getErrorCodeIntent(
-                                                    ErrorCodes.UNKNOWN_ERROR));
+                                            finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
                                         }
                                     });
                         }
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 af33095e9..bf1fce2c9 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
@@ -12,7 +12,6 @@
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
-import com.firebase.ui.auth.util.CredentialsUtil;
 import com.firebase.ui.auth.util.accountlink.ManualMergeUtils;
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
 import com.google.android.gms.tasks.Continuation;

From e800ec22b5c40744fad4133d03fb3317e0aaf120 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Sat, 10 Mar 2018 23:08:35 -0800
Subject: [PATCH 12/28] Fix tests

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../WelcomeBackPasswordHandlerTest.java       | 72 ++-----------------
 1 file changed, 4 insertions(+), 68 deletions(-)

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 f63fc0682..2c91bb311 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
@@ -61,40 +61,6 @@ public void setUp() {
         mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials, null);
     }
 
-    @Test
-    public void testSignIn_signsInAndSavesCredentials() {
-        mHandler.getSignInResult().observeForever(mResponseObserver);
-
-        // Mock sign in to always succeed
-        when(mMockAuth.signInWithEmailAndPassword(TestConstants.EMAIL, TestConstants.PASSWORD))
-                .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
-
-        // Mock smartlock save to always succeed
-        when(mMockCredentials.save(any(Credential.class)))
-                .thenReturn(AutoCompleteTask.<Void>forSuccess(null));
-
-        // Kick off the sign in flow
-        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, null, null, null);
-
-        // Verify that we get a loading event
-        verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-
-        // Verify that sign in is called with the right arguments
-        verify(mMockAuth).signInWithEmailAndPassword(
-                TestConstants.EMAIL, TestConstants.PASSWORD);
-
-        // Verify that a matching credential is saved in SmartLock
-        ArgumentCaptor<Credential> credentialCaptor = ArgumentCaptor.forClass(Credential.class);
-        verify(mMockCredentials).save(credentialCaptor.capture());
-
-        Credential captured = credentialCaptor.getValue();
-        assertEquals(captured.getId(), TestConstants.EMAIL);
-        assertEquals(captured.getPassword(), TestConstants.PASSWORD);
-
-        // Verify that we get a success event
-        verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isSuccess()));
-    }
-
     @Test
     public void testSignIn_linksIdpCredential() {
         mHandler.getSignInOperation().observeForever(mResponseObserver);
@@ -117,9 +83,9 @@ public void testSignIn_linksIdpCredential() {
         // Mock linking to always succeed
         when(FakeAuthResult.INSTANCE.getUser().linkWithCredential(credential))
                 .thenReturn(new AutoContinueTask<>(FakeAuthResult.INSTANCE,
-                        FakeAuthResult.INSTANCE,
-                        true,
-                        null));
+                                                   FakeAuthResult.INSTANCE,
+                                                   true,
+                                                   null));
 
         // Mock smartlock save to always succeed
         when(mMockCredentials.save(any(Credential.class)))
@@ -127,7 +93,7 @@ public void testSignIn_linksIdpCredential() {
 
         // Kick off the sign in flow
         mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, response, credential,
-                null);
+                             null);
 
         // Verify that we get a loading event
         verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
@@ -164,34 +130,4 @@ public void testSignIn_propagatesFailure() {
         // Verify that we get a failure event
         verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isFailure()));
     }
-
-    @Test
-    public void testSignIn_handlesResolution() {
-        mHandler.getSignInResult().observeForever(mResponseObserver);
-        mHandler.getPendingResolution().observeForever(mResolutionObserver);
-
-        // Mock sign in to always succeed
-        when(mMockAuth.signInWithEmailAndPassword(TestConstants.EMAIL, TestConstants.PASSWORD))
-                .thenReturn(new AutoContinueTask<>(FakeAuthResult.INSTANCE,
-                        FakeAuthResult.INSTANCE, true, null));
-
-        // Mock credentials to throw an RAE
-        ResolvableApiException mockRae = mock(ResolvableApiException.class);
-        when(mMockCredentials.save(any(Credential.class)))
-                .thenReturn(AutoCompleteTask.<Void>forFailure(mockRae));
-
-        // Kick off the sign in flow
-        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, null, null, null);
-
-        // Make sure we get a resolution
-        ArgumentCaptor<PendingResolution> resolveCaptor = ArgumentCaptor.forClass(PendingResolution.class);
-        verify(mResolutionObserver).onChanged(resolveCaptor.capture());
-
-        // Call activity result
-        PendingResolution pr = resolveCaptor.getValue();
-        mHandler.onActivityResult(pr.getRequestCode(), Activity.RESULT_OK, null);
-
-        // Make sure we get success
-        verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isSuccess()));
-    }
 }

From 460f4307089d3933e2517058758147d725eea567 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Fri, 16 Mar 2018 19:07:01 -0700
Subject: [PATCH 13/28] Fix merge mistakes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java    | 2 +-
 .../com/firebase/ui/auth/util/accountlink/AccountLinker.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
index ae6b9e0c5..3dafb5f54 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
@@ -25,10 +25,10 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.WelcomeBackPasswordPrompt;
 import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.util.data.ProviderUtils;
+import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
index ab36f3050..c56f153b0 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
@@ -7,7 +7,7 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.ui.TaskFailureLogger;
+import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;

From f4fae6bd80d439875d7e8ba3cb8bdbdb334ec190 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Sun, 25 Mar 2018 14:31:39 -0700
Subject: [PATCH 14/28] Get things working again

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../uidemo/auth/SignedInActivity.java         |  5 +-
 app/src/main/res/layout/signed_in_layout.xml  |  2 +-
 .../auth/data/remote/SignInKickstarter.java   | 27 ++++++--
 .../ui/auth/ui/idp/WelcomeBackIdpPrompt.java  |  1 -
 .../ui/auth/ui/phone/PhoneActivity.java       |  8 ++-
 .../auth/util/accountlink/AccountLinker.java  | 32 ++++-----
 .../ui/auth/viewmodel/AuthViewModelBase.java  | 11 +++-
 .../ui/auth/viewmodel/ViewModelBase.java      |  2 +-
 .../email/WelcomeBackPasswordHandler.java     |  2 +-
 .../LinkingSocialProviderResponseHandler.java | 65 +++++--------------
 .../idp/SocialProviderResponseHandler.java    | 58 ++++++++++++++---
 11 files changed, 124 insertions(+), 89 deletions(-)

diff --git a/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java b/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
index 48b2f8f3f..caf688d7f 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
@@ -87,6 +87,7 @@ public void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
         populateProfile();
         populateIdpToken(response);
+        populatePrevUid(response);
     }
 
     @Override
@@ -221,8 +222,8 @@ private void populateIdpToken(@Nullable IdpResponse response) {
         }
     }
 
-    private void populatePrevUid() {
-        String prevUid = mIdpResponse == null ? null : mIdpResponse.getPrevUid();
+    private void populatePrevUid(IdpResponse response) {
+        String prevUid = response == null ? null : response.getPrevUid();
 
         if (prevUid == null) {
             findViewById(R.id.prev_uid_layout).setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/signed_in_layout.xml b/app/src/main/res/layout/signed_in_layout.xml
index 4be458891..8d95986eb 100644
--- a/app/src/main/res/layout/signed_in_layout.xml
+++ b/app/src/main/res/layout/signed_in_layout.xml
@@ -48,7 +48,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_margin="8dp"
-                android:text="@string/link_account" />
+                android:text="@string/options_link_account" />
 
         </LinearLayout>
 
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 e35eece61..c05667d5b 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
@@ -19,6 +19,7 @@
 import com.firebase.ui.auth.ui.idp.SingleSignInActivity;
 import com.firebase.ui.auth.ui.phone.PhoneActivity;
 import com.firebase.ui.auth.util.GoogleApiUtils;
+import com.firebase.ui.auth.util.accountlink.ManualMergeUtils;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
@@ -43,6 +44,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
 
 public class SignInKickstarter extends AuthViewModelBase<IdpResponse> {
     public SignInKickstarter(Application application) {
@@ -178,21 +180,34 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
     }
 
     private void handleCredential(final Credential credential) {
-        String id = credential.getId();
-        String password = credential.getPassword();
+        final String email = credential.getId();
+        final String password = credential.getPassword();
         if (TextUtils.isEmpty(password)) {
             String identity = credential.getAccountType();
             if (identity == null) {
                 startAuthMethodChoice();
             } else {
                 redirectSignIn(
-                        ProviderUtils.accountTypeToProviderId(credential.getAccountType()), id);
+                        ProviderUtils.accountTypeToProviderId(credential.getAccountType()), email);
             }
         } else {
-            final IdpResponse response = new IdpResponse.Builder(
-                    new User.Builder(EmailAuthProvider.PROVIDER_ID, id).build()).build();
+            // Because we are being called from Smart Lock,
+            // we can assume that the account already exists and a user collision exception will be
+            // thrown so we don't bother with linking credentials
+            final IdpResponse response =
+                    new IdpResponse.Builder(new User.Builder(EmailAuthProvider.PROVIDER_ID, email)
+                            .setPrevUid(getUidForAccountLinking())
+                            .build()).build();
 
-            getAuth().signInWithEmailAndPassword(id, password)
+            ManualMergeUtils.injectSignInTaskBetweenDataTransfer(getApplication(),
+                    response,
+                    getArguments(),
+                    new Callable<Task<AuthResult>>() {
+                        @Override
+                        public Task<AuthResult> call() {
+                            return getAuth().signInWithEmailAndPassword(email, password);
+                        }
+                    })
                     .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                         @Override
                         public void onSuccess(AuthResult result) {
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 49f3d7de8..9113d97a8 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
@@ -42,7 +42,6 @@
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
-import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.util.ui.FlowUtils;
 import com.firebase.ui.auth.viewmodel.idp.LinkingSocialProviderResponseHandler;
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 0dee6a59e..d827e87be 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
@@ -14,6 +14,7 @@
 
 package com.firebase.ui.auth.ui.phone;
 
+import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -40,6 +41,7 @@
 import com.firebase.ui.auth.util.FirebaseAuthError;
 import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.util.accountlink.ManualMergeUtils;
+import com.firebase.ui.auth.viewmodel.idp.SocialProviderResponseHandler;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
@@ -357,9 +359,13 @@ public void onFailure(@NonNull Exception e) {
             return;
         }
 
+        SocialProviderResponseHandler handler =
+                ViewModelProviders.of(this).get(SocialProviderResponseHandler.class);
+        handler.init(getFlowParams());
+
         Task<AuthResult> signInTask;
         if (getAuthHelper().canLinkAccounts()) {
-            signInTask = AccountLinker.linkWithCurrentUser(this, response, credential);
+            signInTask = AccountLinker.linkWithCurrentUser(handler, response, credential);
         } else {
             signInTask = getAuthHelper().getFirebaseAuth().signInWithCredential(credential);
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
index c56f153b0..d4787ec3c 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
@@ -6,8 +6,8 @@
 
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.remote.ProfileMerger;
-import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.data.TaskFailureLogger;
+import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
@@ -29,7 +29,7 @@
 public final class AccountLinker {
     private static final String TAG = "AccountLinker";
 
-    private final HelperActivityBase mActivity;
+    private final AuthViewModelBase<?> mHandler;
     private final IdpResponse mIdpResponse;
 
     /** The credential of the user's existing account. */
@@ -40,11 +40,11 @@ public final class AccountLinker {
 
     private final Task<AuthResult> mTask;
 
-    private AccountLinker(HelperActivityBase activity,
+    private AccountLinker(AuthViewModelBase<?> handler,
                           IdpResponse response,
                           @NonNull AuthCredential existingCredential,
                           @Nullable AuthCredential newCredential) {
-        mActivity = activity;
+        mHandler = handler;
         mIdpResponse = response;
         mExistingCredential = existingCredential;
         mNewCredential = newCredential;
@@ -52,24 +52,24 @@ private AccountLinker(HelperActivityBase activity,
         mTask = start();
     }
 
-    public static Task<AuthResult> linkWithCurrentUser(HelperActivityBase activity,
+    public static Task<AuthResult> linkWithCurrentUser(AuthViewModelBase<?> handler,
                                                        IdpResponse response,
                                                        AuthCredential existingCredential) {
-        return new AccountLinker(activity, response, existingCredential, null).mTask;
+        return new AccountLinker(handler, response, existingCredential, null).mTask;
     }
 
-    public static Task<AuthResult> linkToNewUser(HelperActivityBase activity,
+    public static Task<AuthResult> linkToNewUser(AuthViewModelBase<?> handler,
                                                  IdpResponse response,
                                                  AuthCredential existingCredential,
                                                  AuthCredential newCredential) {
-        return new AccountLinker(activity, response, existingCredential, newCredential).mTask;
+        return new AccountLinker(handler, response, existingCredential, newCredential).mTask;
     }
 
     private Task<AuthResult> start() {
-        FirebaseUser currentUser = mActivity.getAuthHelper().getCurrentUser();
+        FirebaseUser currentUser = mHandler.getCurrentUser();
         if (currentUser == null) {
             // The user has an existing account and is trying to log in with a new provider
-            return mActivity.getAuthHelper().getFirebaseAuth()
+            return mHandler.getAuth()
                     .signInWithCredential(mExistingCredential)
                     .continueWithTask(new NoCurrentUser())
                     .addOnFailureListener(
@@ -108,21 +108,21 @@ private final class ExistingUser implements Continuation<AuthResult, Task<AuthRe
         @Override
         public Task<AuthResult> then(@NonNull final Task<AuthResult> task) {
             if (task.getException() instanceof FirebaseAuthUserCollisionException
-                    && mActivity.getAuthHelper().canLinkAccounts()) {
+                    && mHandler.canLinkAccounts()) {
                 mIdpResponse.getUser()
-                        .setPrevUid(mActivity.getAuthHelper().getUidForAccountLinking());
+                        .setPrevUid(mHandler.getUidForAccountLinking());
 
                 // Since we still want the user to be able to sign in even though
                 // they have an existing account, we are going to save the uid of the
                 // current user, log them out, and then sign in with the new credential.
                 Task<AuthResult> signInTask = ManualMergeUtils.injectSignInTaskBetweenDataTransfer(
-                        mActivity,
+                        mHandler.getApplication(),
                         mIdpResponse,
-                        mActivity.getFlowParams(),
+                        mHandler.getArguments(),
                         new Callable<Task<AuthResult>>() {
                             @Override
                             public Task<AuthResult> call() {
-                                return mActivity.getAuthHelper().getFirebaseAuth()
+                                return mHandler.getAuth()
                                         .signInWithCredential(mExistingCredential)
                                         .continueWithTask(new ProfileMerger(mIdpResponse))
                                         .continueWithTask(new ExceptionWrapper(task));
@@ -141,7 +141,7 @@ public Task<AuthResult> call() {
                     return signInTask.continueWithTask(new Continuation<AuthResult, Task<AuthResult>>() {
                         @Override
                         public Task<AuthResult> then(@NonNull Task<AuthResult> task) {
-                            return mActivity.getAuthHelper().getCurrentUser()
+                            return mHandler.getCurrentUser()
                                     .linkWithCredential(mNewCredential)
                                     .continueWithTask(new ProfileMerger(mIdpResponse))
                                     .continueWithTask(new ExceptionWrapper(task))
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 c617807ce..a1b8b71c8 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
@@ -37,7 +37,7 @@ public FirebaseUser getCurrentUser() {
         return mAuth.getCurrentUser();
     }
 
-    protected FirebaseAuth getAuth() {
+    public FirebaseAuth getAuth() {
         return mAuth;
     }
 
@@ -49,6 +49,15 @@ protected CredentialsClient getCredentialsClient() {
         return mCredentialsClient;
     }
 
+    public boolean canLinkAccounts() {
+        return getArguments().accountLinkingEnabled && getCurrentUser() != null;
+    }
+
+    @Nullable
+    public String getUidForAccountLinking() {
+        return canLinkAccounts() ? getCurrentUser().getUid() : null;
+    }
+
     @VisibleForTesting
     public void initializeForTesting(FlowParameters parameters,
                                      FirebaseAuth auth,
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/ViewModelBase.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/ViewModelBase.java
index 73ab859ca..8b833ecdc 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/ViewModelBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/ViewModelBase.java
@@ -26,7 +26,7 @@ public void init(T args) {
 
     protected void onCreate() {}
 
-    protected T getArguments() {
+    public T getArguments() {
         return mArguments;
     }
 
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 93e5e3810..7b979948f 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
@@ -9,8 +9,8 @@
 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.data.TaskFailureLogger;
 import com.firebase.ui.auth.util.accountlink.ManualMergeUtils;
+import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.OnCompleteListener;
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java
index 4b65d6b96..8fdd2685e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java
@@ -8,15 +8,13 @@
 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.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
-import com.google.android.gms.tasks.Continuation;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.Tasks;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
-import com.google.firebase.auth.FirebaseUser;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class LinkingSocialProviderResponseHandler extends AuthViewModelBase<IdpResponse> {
@@ -42,49 +40,18 @@ public void startSignIn(@NonNull final IdpResponse response) {
         setResult(Resource.<IdpResponse>forLoading());
 
         AuthCredential credential = ProviderUtils.getAuthCredential(response);
-        FirebaseUser currentUser = getCurrentUser();
-        if (currentUser == null) {
-            getAuth().signInWithCredential(credential)
-                    .continueWithTask(new Continuation<AuthResult, Task<Void>>() {
-                        @Override
-                        public Task<Void> then(@NonNull Task<AuthResult> task) {
-                            AuthResult result = task.getResult();
-                            if (mRequestedSignInCredential == null) {
-                                return Tasks.forResult(null);
-                            } else {
-                                return result.getUser()
-                                        .linkWithCredential(mRequestedSignInCredential)
-                                        .continueWith(new Continuation<AuthResult, Void>() {
-                                            @Override
-                                            public Void then(@NonNull Task<AuthResult> task) {
-                                                // Since we've already signed in, it's too late to
-                                                // backtrack so we just ignore any errors.
-                                                return null;
-                                            }
-                                        });
-                            }
-                        }
-                    })
-                    .addOnCompleteListener(new OnCompleteListener<Void>() {
-                        @Override
-                        public void onComplete(@NonNull Task<Void> task) {
-                            if (task.isSuccessful()) {
-                                setResult(Resource.forSuccess(response));
-                            } else {
-                                setResult(Resource.<IdpResponse>forFailure(task.getException()));
-                            }
-                        }
-                    });
-        } else {
-            currentUser.linkWithCredential(credential)
-                    .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
-                        @Override
-                        public void onComplete(@NonNull Task<AuthResult> task) {
-                            // I'm not sure why we ignore failures here, but this mirrors previous
-                            // behavior.
-                            setResult(Resource.forSuccess(response));
-                        }
-                    });
-        }
+        AccountLinker.linkToNewUser(this, response, credential, mRequestedSignInCredential)
+                .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
+                    @Override
+                    public void onSuccess(AuthResult result) {
+                        setResult(Resource.forSuccess(response));
+                    }
+                })
+                .addOnFailureListener(new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        setResult(Resource.<IdpResponse>forFailure(e));
+                    }
+                });
     }
 }
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 7255ff0b9..42f918e1c 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
@@ -7,6 +7,7 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.FirebaseUiException;
 import com.firebase.ui.auth.IdpResponse;
@@ -16,15 +17,21 @@
 import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.email.WelcomeBackPasswordPrompt;
 import com.firebase.ui.auth.ui.idp.WelcomeBackIdpPrompt;
+import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.PhoneAuthProvider;
+import com.google.firebase.auth.ProviderQueryResult;
+
+import java.util.List;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class SocialProviderResponseHandler extends AuthViewModelBase<IdpResponse> {
@@ -44,8 +51,17 @@ public void startSignIn(@NonNull final IdpResponse response) {
         }
         setResult(Resource.<IdpResponse>forLoading());
 
-        getAuth().signInWithCredential(ProviderUtils.getAuthCredential(response))
-                .continueWithTask(new ProfileMerger(response))
+        AuthCredential credential = ProviderUtils.getAuthCredential(response);
+        Task<AuthResult> signInTask;
+        if (canLinkAccounts()) {
+            signInTask = getCurrentUser()
+                    .linkWithCredential(credential)
+                    .continueWithTask(new ProfileMerger(response));
+        } else {
+            signInTask = getAuth().signInWithCredential(credential);
+        }
+
+        signInTask.continueWithTask(new ProfileMerger(response))
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                     @Override
                     public void onSuccess(AuthResult result) {
@@ -58,9 +74,8 @@ public void onFailure(@NonNull Exception e) {
                         String email = response.getEmail();
                         if (email != null) {
                             if (e instanceof FirebaseAuthUserCollisionException) {
-                                ProviderUtils.fetchTopProvider(getAuth(), email)
-                                        .addOnSuccessListener(
-                                                new StartWelcomeBackFlow(response))
+                                getAuth().fetchProvidersForEmail(email)
+                                        .addOnSuccessListener(new StartWelcomeBackFlow(response))
                                         .addOnFailureListener(new OnFailureListener() {
                                             @Override
                                             public void onFailure(@NonNull Exception e) {
@@ -93,7 +108,7 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
         }
     }
 
-    private class StartWelcomeBackFlow implements OnSuccessListener<String> {
+    private class StartWelcomeBackFlow implements OnSuccessListener<ProviderQueryResult> {
         private final IdpResponse mResponse;
 
         public StartWelcomeBackFlow(IdpResponse response) {
@@ -101,13 +116,36 @@ public StartWelcomeBackFlow(IdpResponse response) {
         }
 
         @Override
-        public void onSuccess(String provider) {
+        public void onSuccess(ProviderQueryResult result) {
+            List<String> providers = result.getProviders();
+            AuthCredential credential = ProviderUtils.getAuthCredential(mResponse);
+            if (canLinkAccounts() && credential != null
+                    && providers != null && providers.contains(credential.getProvider())) {
+                // We don't want to show the welcome back dialog since the user selected
+                // an existing account and we can just link the two accounts without knowing
+                // prevCredential.
+                AccountLinker.linkWithCurrentUser(
+                        SocialProviderResponseHandler.this, mResponse, credential)
+                        .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
+                            @Override
+                            public void onSuccess(AuthResult result) {
+                                setResult(Resource.forSuccess(mResponse));
+                            }
+                        })
+                        .addOnFailureListener(new OnFailureListener() {
+                            @Override
+                            public void onFailure(@NonNull Exception e) {
+                                setResult(Resource.<IdpResponse>forFailure(e));
+                            }
+                        });
+                return;
+            }
+
+            @AuthUI.SupportedProvider String provider = ProviderUtils.getLastUsedProvider(result);
             if (provider == null) {
                 throw new IllegalStateException(
                         "No provider even though we received a FirebaseAuthUserCollisionException");
-            }
-
-            if (provider.equals(EmailAuthProvider.PROVIDER_ID)) {
+            } else if (provider.equals(EmailAuthProvider.PROVIDER_ID)) {
                 // Start email welcome back flow
                 setResult(Resource.<IdpResponse>forUsableFailure(new IntentRequiredException(
                         WelcomeBackPasswordPrompt.createIntent(

From a202658c3d774f875763a3a8a8b1f7775a393cdb Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Sun, 25 Mar 2018 14:39:38 -0700
Subject: [PATCH 15/28] Fixes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../ui/auth/viewmodel/idp/SocialProviderResponseHandler.java    | 2 ++
 1 file changed, 2 insertions(+)

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 42f918e1c..44dd4ff53 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
@@ -82,6 +82,8 @@ public void onFailure(@NonNull Exception e) {
                                                 setResult(Resource.<IdpResponse>forFailure(e));
                                             }
                                         });
+                            } else {
+                                setResult(Resource.<IdpResponse>forFailure(e));
                             }
                         } else {
                             setResult(Resource.<IdpResponse>forFailure(e));

From 9e05a24b61a13f81c62d1406b7e3df07cdef4c96 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Wed, 28 Mar 2018 15:00:49 -0700
Subject: [PATCH 16/28] Fix merge mistakes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../firebase/ui/auth/util/data/ProviderUtils.java   | 13 ++++++++-----
 .../idp/SocialProviderResponseHandler.java          | 12 ++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/util/data/ProviderUtils.java b/auth/src/main/java/com/firebase/ui/auth/util/data/ProviderUtils.java
index aeb85fde3..3942512b3 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/data/ProviderUtils.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/data/ProviderUtils.java
@@ -152,11 +152,7 @@ public static Task<String> fetchTopProvider(FirebaseAuth auth, @NonNull String e
                 .continueWith(new Continuation<SignInMethodQueryResult, String>() {
                     @Override
                     public String then(@NonNull Task<SignInMethodQueryResult> task) {
-                        if (!task.isSuccessful()) return null;
-
-                        List<String> methods = task.getResult().getSignInMethods();
-                        return methods == null || methods.isEmpty()
-                                ? null : methods.get(methods.size() - 1);
+                        return task.isSuccessful() ? getLastUsedProvider(task.getResult()) : null;
                     }
                 }).continueWith(new Continuation<String, String>() {
                     @Override
@@ -170,4 +166,11 @@ public String then(@NonNull Task<String> task) {
                     }
                 });
     }
+
+    @Nullable
+    public static String getLastUsedProvider(SignInMethodQueryResult result) {
+        List<String> methods = result.getSignInMethods();
+        return methods == null || methods.isEmpty()
+                ? null : methods.get(methods.size() - 1);
+    }
 }
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 a191c5ffa..3eb210352 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
@@ -29,7 +29,7 @@
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.PhoneAuthProvider;
-import com.google.firebase.auth.ProviderQueryResult;
+import com.google.firebase.auth.SignInMethodQueryResult;
 
 import java.util.List;
 
@@ -74,7 +74,7 @@ public void onFailure(@NonNull Exception e) {
                         String email = response.getEmail();
                         if (email != null) {
                             if (e instanceof FirebaseAuthUserCollisionException) {
-                                getAuth().fetchProvidersForEmail(email)
+                                getAuth().fetchSignInMethodsForEmail(email)
                                         .addOnSuccessListener(new StartWelcomeBackFlow(response))
                                         .addOnFailureListener(new OnFailureListener() {
                                             @Override
@@ -108,7 +108,7 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
         }
     }
 
-    private class StartWelcomeBackFlow implements OnSuccessListener<ProviderQueryResult> {
+    private class StartWelcomeBackFlow implements OnSuccessListener<SignInMethodQueryResult> {
         private final IdpResponse mResponse;
 
         public StartWelcomeBackFlow(IdpResponse response) {
@@ -116,11 +116,11 @@ public StartWelcomeBackFlow(IdpResponse response) {
         }
 
         @Override
-        public void onSuccess(ProviderQueryResult result) {
-            List<String> providers = result.getProviders();
+        public void onSuccess(SignInMethodQueryResult result) {
+            List<String> methods = result.getSignInMethods();
             AuthCredential credential = ProviderUtils.getAuthCredential(mResponse);
             if (canLinkAccounts() && credential != null
-                    && providers != null && providers.contains(credential.getProvider())) {
+                    && methods != null && methods.contains(credential.getSignInMethod())) {
                 // We don't want to show the welcome back dialog since the user selected
                 // an existing account and we can just link the two accounts without knowing
                 // prevCredential.

From c4d93fae3ed67b54cd13407c7b5ae4f995612663 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Thu, 12 Apr 2018 14:06:52 -0700
Subject: [PATCH 17/28] Fix merge mistakes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../viewmodel/idp/EmailProviderResponseHandler.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/EmailProviderResponseHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/EmailProviderResponseHandler.java
index 0e4f92bb3..98686e5fe 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/EmailProviderResponseHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/EmailProviderResponseHandler.java
@@ -17,6 +17,7 @@
 import com.firebase.ui.auth.viewmodel.RequestCodes;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
@@ -41,7 +42,14 @@ public void startSignIn(@NonNull final IdpResponse response, @NonNull String pas
         setResult(Resource.<IdpResponse>forLoading());
 
         final String email = response.getEmail();
-        getAuth().createUserWithEmailAndPassword(email, password)
+        Task<AuthResult> registerTask;
+        if (canLinkAccounts()) {
+            registerTask = getCurrentUser()
+                    .linkWithCredential(EmailAuthProvider.getCredential(email, password));
+        } else {
+            registerTask = getAuth().createUserWithEmailAndPassword(email, password);
+        }
+        registerTask
                 .continueWithTask(new ProfileMerger(response))
                 .addOnFailureListener(new TaskFailureLogger(TAG, "Error creating user"))
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {

From 556daf10c376b066e1659d76118117444a169ad5 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Mon, 7 May 2018 17:54:17 -0700
Subject: [PATCH 18/28] Fix potential account linking sign-in failure due to
 recursive sign-in attempts

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 auth/src/main/java/com/firebase/ui/auth/AuthUI.java |  3 ++-
 .../ui/auth/ui/idp/AuthMethodPickerActivity.java    | 13 ++++++++++---
 .../ui/auth/viewmodel/ResourceObserver.java         |  7 ++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

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 fd9bc416f..cc8504a72 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -90,7 +90,8 @@
  */
 public final class AuthUI {
 
-    private static final String TAG = "AuthUI";
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public static final String TAG = "AuthUI";
 
     @StringDef({
                        EmailAuthProvider.PROVIDER_ID,
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 66488dda1..4fbd3b12f 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
@@ -117,7 +117,9 @@ private void populateIdpList(List<IdpConfig> providerConfigs,
         for (IdpConfig idpConfig : providerConfigs) {
             final ProviderSignInBase<?> provider;
             @LayoutRes int buttonLayout;
-            switch (idpConfig.getProviderId()) {
+
+            final String providerId = idpConfig.getProviderId();
+            switch (providerId) {
                 case GoogleAuthProvider.PROVIDER_ID:
                     GoogleSignInHandler google = supplier.get(GoogleSignInHandler.class);
                     google.init(new GoogleSignInHandler.Params(idpConfig));
@@ -154,7 +156,7 @@ private void populateIdpList(List<IdpConfig> providerConfigs,
                     buttonLayout = R.layout.fui_provider_button_phone;
                     break;
                 default:
-                    throw new IllegalStateException("Unknown provider: " + idpConfig.getProviderId());
+                    throw new IllegalStateException("Unknown provider: " + providerId);
             }
             mProviders.add(provider);
 
@@ -175,7 +177,12 @@ private void handleResponse(@NonNull IdpResponse response) {
                         // We have no idea what provider this error stemmed from so just forward
                         // this along to the handler.
                         handler.startSignIn(response);
-                    } else if (AuthUI.SOCIAL_PROVIDERS.contains(response.getProviderType())) {
+                    } else if (AuthUI.SOCIAL_PROVIDERS.contains(providerId)) {
+                        // 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
+                        // existed. In the previous example, an extra sign-in would incorrectly
+                        // started.
                         handler.startSignIn(response);
                     } else {
                         // Email or phone: the credentials should have already been saved so simply
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/ResourceObserver.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/ResourceObserver.java
index ce438002c..433ef4f65 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/ResourceObserver.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/ResourceObserver.java
@@ -4,7 +4,9 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
 import android.support.annotation.StringRes;
+import android.util.Log;
 
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.data.model.State;
 import com.firebase.ui.auth.ui.FragmentBase;
@@ -51,7 +53,10 @@ public final void onChanged(Resource<T> resource) {
             } else {
                 unhandled = FlowUtils.unhandled(mFragment, e);
             }
-            if (unhandled) { onFailure(e); }
+            if (unhandled) {
+                Log.e(AuthUI.TAG, "A sign-in error occurred.", e);
+                onFailure(e);
+            }
         }
     }
 

From 3886b0b081b78d7ac35a9a0069c0830e2456d16f Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Mon, 18 Jun 2018 20:47:13 -0700
Subject: [PATCH 19/28] Fix merge mistakes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../ui/auth/ui/email/WelcomeBackPasswordPrompt.java    |  3 +--
 .../ui/auth/util/accountlink/AccountLinker.java        | 10 +++++-----
 .../firebase/ui/auth/viewmodel/AuthViewModelBase.java  |  9 ---------
 .../ui/auth/viewmodel/SignInViewModelBase.java         | 10 ++++++++++
 .../viewmodel/email/WelcomeBackPasswordHandler.java    |  7 +++----
 .../idp/LinkingSocialProviderResponseHandler.java      |  2 +-
 .../auth/viewmodel/WelcomeBackPasswordHandlerTest.java |  6 +++---
 7 files changed, 23 insertions(+), 24 deletions(-)

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 abaf8ba06..2c2ace31e 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
@@ -163,8 +163,7 @@ private void validateAndSignIn(String password) {
         }
 
         AuthCredential authCredential = ProviderUtils.getAuthCredential(mIdpResponse);
-        mHandler.startSignIn(mIdpResponse.getEmail(), password, mIdpResponse, authCredential,
-                getAuthHelper().getUidForAccountLinking());
+        mHandler.startSignIn(mIdpResponse.getEmail(), password, mIdpResponse, authCredential);
     }
 
     @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
index d4787ec3c..9cc994dd3 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
@@ -7,7 +7,7 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.util.data.TaskFailureLogger;
-import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
+import com.firebase.ui.auth.viewmodel.SignInViewModelBase;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
@@ -29,7 +29,7 @@
 public final class AccountLinker {
     private static final String TAG = "AccountLinker";
 
-    private final AuthViewModelBase<?> mHandler;
+    private final SignInViewModelBase mHandler;
     private final IdpResponse mIdpResponse;
 
     /** The credential of the user's existing account. */
@@ -40,7 +40,7 @@ public final class AccountLinker {
 
     private final Task<AuthResult> mTask;
 
-    private AccountLinker(AuthViewModelBase<?> handler,
+    private AccountLinker(SignInViewModelBase handler,
                           IdpResponse response,
                           @NonNull AuthCredential existingCredential,
                           @Nullable AuthCredential newCredential) {
@@ -52,13 +52,13 @@ private AccountLinker(AuthViewModelBase<?> handler,
         mTask = start();
     }
 
-    public static Task<AuthResult> linkWithCurrentUser(AuthViewModelBase<?> handler,
+    public static Task<AuthResult> linkWithCurrentUser(SignInViewModelBase handler,
                                                        IdpResponse response,
                                                        AuthCredential existingCredential) {
         return new AccountLinker(handler, response, existingCredential, null).mTask;
     }
 
-    public static Task<AuthResult> linkToNewUser(AuthViewModelBase<?> handler,
+    public static Task<AuthResult> linkToNewUser(SignInViewModelBase handler,
                                                  IdpResponse response,
                                                  AuthCredential existingCredential,
                                                  AuthCredential newCredential) {
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 a1b8b71c8..7ec21f620 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
@@ -49,15 +49,6 @@ protected CredentialsClient getCredentialsClient() {
         return mCredentialsClient;
     }
 
-    public boolean canLinkAccounts() {
-        return getArguments().accountLinkingEnabled && getCurrentUser() != null;
-    }
-
-    @Nullable
-    public String getUidForAccountLinking() {
-        return canLinkAccounts() ? getCurrentUser().getUid() : null;
-    }
-
     @VisibleForTesting
     public void initializeForTesting(FlowParameters parameters,
                                      FirebaseAuth auth,
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/SignInViewModelBase.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/SignInViewModelBase.java
index 440563c25..33723acd7 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/SignInViewModelBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/SignInViewModelBase.java
@@ -2,6 +2,7 @@
 
 import android.app.Application;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 
 import com.firebase.ui.auth.IdpResponse;
@@ -19,6 +20,15 @@ protected void setResult(Resource<IdpResponse> output) {
         super.setResult(output);
     }
 
+    public boolean canLinkAccounts() {
+        return getArguments().accountLinkingEnabled && getCurrentUser() != null;
+    }
+
+    @Nullable
+    public String getUidForAccountLinking() {
+        return canLinkAccounts() ? getCurrentUser().getUid() : null;
+    }
+
     protected void handleSuccess(@NonNull IdpResponse response, @NonNull AuthResult result) {
         setResult(Resource.forSuccess(response.withResult(result)));
     }
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 e80069503..5258aea3a 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
@@ -43,8 +43,7 @@ public WelcomeBackPasswordHandler(Application application) {
     public void startSignIn(@NonNull final String email,
                             @NonNull final String password,
                             @NonNull final IdpResponse inputResponse,
-                            @Nullable final AuthCredential credential,
-                            @Nullable final String prevUid) {
+                            @Nullable final AuthCredential credential) {
         setResult(Resource.<IdpResponse>forLoading());
 
         // Store the password before signing in so it can be used for later credential building
@@ -56,7 +55,7 @@ public void startSignIn(@NonNull final String email,
             // New credential for the email provider
             outputResponse = new IdpResponse.Builder(
                     new User.Builder(EmailAuthProvider.PROVIDER_ID, email)
-                            .setPrevUid(prevUid).build())
+                            .setPrevUid(getUidForAccountLinking()).build())
                     .build();
         } else {
             // New credential for an IDP (Phone or Social)
@@ -64,7 +63,7 @@ public void startSignIn(@NonNull final String email,
                     .setToken(inputResponse.getIdpToken())
                     .setSecret(inputResponse.getIdpSecret())
                     .build();
-            outputResponse.getUser().setPrevUid(prevUid);
+            outputResponse.getUser().setPrevUid(getUidForAccountLinking());
         }
 
         // Kick off the flow including signing in, linking accounts, and saving with SmartLock
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java
index 98d2df5b9..4622e5b34 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java
@@ -10,7 +10,7 @@
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.util.data.ProviderUtils;
-import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
+import com.firebase.ui.auth.viewmodel.SignInViewModelBase;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.AuthCredential;
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 cd6b6118f..8485e608d 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
@@ -92,8 +92,8 @@ public void testSignIn_linksIdpCredential() {
                 .thenReturn(AutoCompleteTask.<Void>forSuccess(null));
 
         // Kick off the sign in flow
-        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, response, credential,
-                             null);
+        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, response, credential
+        );
 
         // Verify that we get a loading event
         verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
@@ -118,7 +118,7 @@ public void testSignIn_propagatesFailure() {
                 .thenReturn(AutoContinueTask.<AuthResult>forFailure(new Exception("FAILED")));
 
         // Kick off the sign in flow
-        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, null, null, null);
+        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, null, null);
 
         // Verify that we get a loading event
         verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));

From be283dde5b1f1a7f4d3cc215e2078943606be161 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Mon, 18 Jun 2018 21:59:00 -0700
Subject: [PATCH 20/28] Fix broken phone auth merging

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 .../auth/util/accountlink/AccountLinker.java  | 11 +++++--
 .../phone/PhoneProviderResponseHandler.java   | 29 ++++++++++++-------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
index 9cc994dd3..1c1e04970 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/accountlink/AccountLinker.java
@@ -107,8 +107,8 @@ public Task<AuthResult> then(@NonNull Task<AuthResult> task) {
     private final class ExistingUser implements Continuation<AuthResult, Task<AuthResult>> {
         @Override
         public Task<AuthResult> then(@NonNull final Task<AuthResult> task) {
-            if (task.getException() instanceof FirebaseAuthUserCollisionException
-                    && mHandler.canLinkAccounts()) {
+            final Exception e = task.getException();
+            if (e instanceof FirebaseAuthUserCollisionException && mHandler.canLinkAccounts()) {
                 mIdpResponse.getUser()
                         .setPrevUid(mHandler.getUidForAccountLinking());
 
@@ -122,8 +122,13 @@ public Task<AuthResult> then(@NonNull final Task<AuthResult> task) {
                         new Callable<Task<AuthResult>>() {
                             @Override
                             public Task<AuthResult> call() {
+                                AuthCredential existingCred =
+                                        ((FirebaseAuthUserCollisionException) e)
+                                                .getUpdatedCredential();
+                                if (existingCred == null) { existingCred = mExistingCredential; }
+
                                 return mHandler.getAuth()
-                                        .signInWithCredential(mExistingCredential)
+                                        .signInWithCredential(existingCred)
                                         .continueWithTask(new ProfileMerger(mIdpResponse))
                                         .continueWithTask(new ExceptionWrapper(task));
                             }
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/phone/PhoneProviderResponseHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/phone/PhoneProviderResponseHandler.java
index cf7a702ff..e1a7736bd 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/phone/PhoneProviderResponseHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/phone/PhoneProviderResponseHandler.java
@@ -6,6 +6,7 @@
 
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.Resource;
+import com.firebase.ui.auth.util.accountlink.AccountLinker;
 import com.firebase.ui.auth.viewmodel.SignInViewModelBase;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
@@ -31,16 +32,22 @@ public void startSignIn(@NonNull PhoneAuthCredential credential,
         }
         setResult(Resource.<IdpResponse>forLoading());
 
-        getAuth().signInWithCredential(credential)
-                .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
-                    @Override
-                    public void onComplete(@NonNull Task<AuthResult> task) {
-                        if (task.isSuccessful()) {
-                            handleSuccess(response, task.getResult());
-                        } else {
-                            setResult(Resource.<IdpResponse>forFailure(task.getException()));
-                        }
-                    }
-                });
+        Task<AuthResult> signInTask;
+        if (canLinkAccounts()) {
+            signInTask = AccountLinker.linkWithCurrentUser(this, response, credential);
+        } else {
+            signInTask = getAuth().signInWithCredential(credential);
+        }
+
+        signInTask.addOnCompleteListener(new OnCompleteListener<AuthResult>() {
+            @Override
+            public void onComplete(@NonNull Task<AuthResult> task) {
+                if (task.isSuccessful()) {
+                    handleSuccess(response, task.getResult());
+                } else {
+                    setResult(Resource.<IdpResponse>forFailure(task.getException()));
+                }
+            }
+        });
     }
 }

From 9f257b67d9329c0cca40eec9ab242e3ab7e7797e Mon Sep 17 00:00:00 2001
From: Leonardo Siracusa <leosiracusa@google.com>
Date: Tue, 26 Jun 2018 14:50:29 -0700
Subject: [PATCH 21/28] Version 4.2.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 16efc522e..328093545 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -1,5 +1,5 @@
 object Config {
-    const val version = "4.1.0"
+    const val version = "4.2.0-SNAPSHOT"
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
     private const val kotlinVersion = "1.2.41"

From 2631d09367bf3312e5f7331f81b36f0928e8f676 Mon Sep 17 00:00:00 2001
From: Leo <39062083+lsirac@users.noreply.github.com>
Date: Fri, 29 Jun 2018 09:25:55 -0700
Subject: [PATCH 22/28] Adds continue as guest (#1375)

---
 .../firebase/uidemo/auth/AuthUiActivity.java  |  5 +
 .../uidemo/auth/SignedInActivity.java         |  2 +-
 app/src/main/res/layout/auth_ui_layout.xml    | 13 ++-
 app/src/main/res/values/strings.xml           |  1 +
 auth/README.md                                |  3 +-
 .../java/com/firebase/ui/auth/AuthUI.java     | 34 ++++++-
 .../data/remote/AnonymousSignInHandler.java   | 79 +++++++++++++++
 .../auth/ui/idp/AuthMethodPickerActivity.java | 15 ++-
 .../drawable/fui_ic_anonymous_white_24dp.xml  | 12 +++
 .../fui_idp_button_background_anonymous.xml   | 19 ++++
 .../layout/fui_provider_button_anonymous.xml  |  6 ++
 auth/src/main/res/values/colors.xml           |  1 +
 auth/src/main/res/values/strings.xml          |  1 +
 auth/src/main/res/values/styles.xml           |  6 ++
 .../java/com/firebase/ui/auth/AuthUITest.java | 18 +++-
 .../ui/auth/testhelpers/TestHelper.java       |  3 +
 .../ui/idp/AuthMethodPickerActivityTest.java  |  8 +-
 .../viewmodel/AnonymousSignInHandlerTest.java | 98 +++++++++++++++++++
 ...kingSocialProviderResponseHandlerTest.java |  2 -
 library/quality/lint-baseline.xml             |  1 -
 20 files changed, 308 insertions(+), 19 deletions(-)
 create mode 100644 auth/src/main/java/com/firebase/ui/auth/data/remote/AnonymousSignInHandler.java
 create mode 100644 auth/src/main/res/drawable/fui_ic_anonymous_white_24dp.xml
 create mode 100644 auth/src/main/res/drawable/fui_idp_button_background_anonymous.xml
 create mode 100644 auth/src/main/res/layout/fui_provider_button_anonymous.xml
 create mode 100644 auth/src/test/java/com/firebase/ui/auth/viewmodel/AnonymousSignInHandlerTest.java

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 c1aeb0632..ca68daab9 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -70,6 +70,7 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.github_provider) CheckBox mUseGitHubProvider;
     @BindView(R.id.email_provider) CheckBox mUseEmailProvider;
     @BindView(R.id.phone_provider) CheckBox mUsePhoneProvider;
+    @BindView(R.id.anonymous_provider) CheckBox mUseAnonymousProvider;
 
     @BindView(R.id.default_theme) RadioButton mDefaultTheme;
     @BindView(R.id.green_theme) RadioButton mGreenTheme;
@@ -319,6 +320,10 @@ private List<IdpConfig> getSelectedProviders() {
             selectedProviders.add(new IdpConfig.PhoneBuilder().build());
         }
 
+        if (mUseAnonymousProvider.isChecked()) {
+            selectedProviders.add(new IdpConfig.AnonymousBuilder().build());
+        }
+
         return selectedProviders;
     }
 
diff --git a/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java b/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
index f921f310c..833ca3f5f 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
@@ -164,7 +164,7 @@ private void populateProfile(@Nullable IdpResponse response) {
 
         List<String> providers = new ArrayList<>();
         if (user.getProviderData().isEmpty()) {
-            providers.add("Anonymous");
+            providers.add(getString(R.string.providers_anonymous));
         } else {
             for (UserInfo info : user.getProviderData()) {
                 switch (info.getProviderId()) {
diff --git a/app/src/main/res/layout/auth_ui_layout.xml b/app/src/main/res/layout/auth_ui_layout.xml
index 913a58d38..c16c150d1 100644
--- a/app/src/main/res/layout/auth_ui_layout.xml
+++ b/app/src/main/res/layout/auth_ui_layout.xml
@@ -34,8 +34,8 @@
                 style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_marginTop="16dp"
+                android:layout_gravity="center"
                 android:text="@string/sign_in_start" />
 
             <Button
@@ -43,8 +43,8 @@
                 style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_marginBottom="16dp"
+                android:layout_gravity="center"
                 android:text="@string/sign_in_silent" />
 
             <TextView
@@ -80,7 +80,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="true"
-                android:text="@string/providers_github"/>
+                android:text="@string/providers_github" />
 
             <CheckBox
                 android:id="@+id/email_provider"
@@ -96,6 +96,13 @@
                 android:checked="true"
                 android:text="@string/providers_phone" />
 
+            <CheckBox
+                android:id="@+id/anonymous_provider"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="@string/providers_anonymous" />
+
             <TextView
                 style="@style/Base.TextAppearance.AppCompat.Subhead"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 21f8093f3..c500e7614 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,6 +27,7 @@
     <string name="providers_twitter">Twitter</string>
     <string name="providers_email">Email</string>
     <string name="providers_phone">Phone</string>
+    <string name="providers_anonymous">Anonymous</string>
 
     <string name="theme_header">Theme</string>
     <string name="theme_default">Default theme</string>
diff --git a/auth/README.md b/auth/README.md
index 366635065..c59046b68 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -328,7 +328,8 @@ startActivityForResult(
                         new AuthUI.IdpConfig.TwitterBuilder().build(),
                         new AuthUI.IdpConfig.GitHubBuilder().build(),
                         new AuthUI.IdpConfig.EmailBuilder().build(),
-                        new AuthUI.IdpConfig.PhoneBuilder().build()))
+                        new AuthUI.IdpConfig.PhoneBuilder().build(),
+                        new AuthUI.IdpConfig.AnonymousBuilder().build()))
                 .build(),
         RC_SIGN_IN);
 ```
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 f7844a78b..2ba5c6a05 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -95,13 +95,20 @@ public final class AuthUI {
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     public static final String TAG = "AuthUI";
 
+    /**
+     * Provider for anonymous users.
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public static final String ANONYMOUS_PROVIDER = "anonymous";
+
     @StringDef({
                        GoogleAuthProvider.PROVIDER_ID,
                        FacebookAuthProvider.PROVIDER_ID,
                        TwitterAuthProvider.PROVIDER_ID,
                        GithubAuthProvider.PROVIDER_ID,
                        EmailAuthProvider.PROVIDER_ID,
-                       PhoneAuthProvider.PROVIDER_ID
+                       PhoneAuthProvider.PROVIDER_ID,
+                       ANONYMOUS_PROVIDER
                })
     @Retention(RetentionPolicy.SOURCE)
     public @interface SupportedProvider {}
@@ -121,7 +128,8 @@ public final class AuthUI {
                     TwitterAuthProvider.PROVIDER_ID,
                     GithubAuthProvider.PROVIDER_ID,
                     EmailAuthProvider.PROVIDER_ID,
-                    PhoneAuthProvider.PROVIDER_ID
+                    PhoneAuthProvider.PROVIDER_ID,
+                    ANONYMOUS_PROVIDER
             )));
 
     /**
@@ -990,6 +998,15 @@ public GitHubBuilder setPermissions(@NonNull List<String> permissions) {
                 return this;
             }
         }
+
+        /**
+         * {@link IdpConfig} builder for the Anonymous provider.
+         */
+        public static final class AnonymousBuilder extends Builder {
+            public AnonymousBuilder() {
+                super(ANONYMOUS_PROVIDER);
+            }
+        }
     }
 
     /**
@@ -1066,7 +1083,8 @@ public T setTosAndPrivacyPolicyUrls(@NonNull String tosUrl,
 
         /**
          * Specified the set of supported authentication providers. At least one provider must
-         * be specified. There may only be one instance of each provider.
+         * be specified. There may only be one instance of each provider. Anonymous provider cannot
+         * be the only provider specified.
          * <p>
          * <p>If no providers are explicitly specified by calling this method, then the email
          * provider is the default supported provider.
@@ -1074,9 +1092,19 @@ public T setTosAndPrivacyPolicyUrls(@NonNull String tosUrl,
          * @param idpConfigs a list of {@link IdpConfig}s, where each {@link IdpConfig} contains the
          *                   configuration parameters for the IDP.
          * @see IdpConfig
+         *
+         * @throws IllegalStateException if anonymous provider is the only specified provider.
          */
         @NonNull
         public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {
+            Preconditions.checkNotNull(idpConfigs, "idpConfigs cannot be null");
+            if (idpConfigs.size() == 1 &&
+                    idpConfigs.get(0).getProviderId().equals(ANONYMOUS_PROVIDER)) {
+                throw new IllegalStateException("Sign in as guest cannot be the only sign in " +
+                        "method. In this case, sign the user in anonymously your self; " +
+                        "no UI is needed.");
+            }
+
             mProviders.clear();
 
             for (IdpConfig config : idpConfigs) {
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
new file mode 100644
index 000000000..5e3f771c4
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/AnonymousSignInHandler.java
@@ -0,0 +1,79 @@
+package com.firebase.ui.auth.data.remote;
+
+import android.app.Application;
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RestrictTo;
+import android.support.annotation.VisibleForTesting;
+
+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;
+import com.firebase.ui.auth.data.model.User;
+import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
+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;
+
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class AnonymousSignInHandler extends ProviderSignInBase<FlowParameters> {
+
+    @VisibleForTesting
+    public FirebaseAuth mAuth;
+
+    public AnonymousSignInHandler(Application application) {
+        super(application);
+    }
+
+    @Override
+    protected void onCreate() {
+        mAuth = getAuth();
+    }
+
+    @Override
+    public void startSignIn(@NonNull HelperActivityBase activity) {
+        setResult(Resource.<IdpResponse>forLoading());
+
+        // Calling signInAnonymously() will always return the same anonymous user if already
+        // available. This is enforced by the client SDK.
+        mAuth.signInAnonymously()
+                .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
+                    @Override
+                    public void onSuccess(AuthResult result) {
+                        setResult(Resource.<IdpResponse>forSuccess(initResponse(
+                                result.getAdditionalUserInfo().isNewUser())));
+                    }
+                })
+                .addOnFailureListener(new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        setResult(Resource.<IdpResponse>forFailure(e));
+                    }
+                });
+
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {}
+
+    private IdpResponse initResponse(boolean isNewUser) {
+        return new IdpResponse.Builder(
+                new User.Builder(AuthUI.ANONYMOUS_PROVIDER, null)
+                        .build())
+                .setNewUser(isNewUser)
+                .build();
+    }
+
+    // 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);
+    }
+}
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 f0d35c160..e036e70b6 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
@@ -41,6 +41,7 @@
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.UserCancellationException;
+import com.firebase.ui.auth.data.remote.AnonymousSignInHandler;
 import com.firebase.ui.auth.data.remote.EmailSignInHandler;
 import com.firebase.ui.auth.data.remote.FacebookSignInHandler;
 import com.firebase.ui.auth.data.remote.GitHubSignInHandler;
@@ -117,7 +118,7 @@ protected void onFailure(@NonNull Exception e) {
                 if (e instanceof FirebaseAuthAnonymousUpgradeException) {
                     finish(ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT,
                             ((FirebaseAuthAnonymousUpgradeException) e).getResponse().toIntent());
-                } else if ( (!(e instanceof UserCancellationException))) {
+                } else if ((!(e instanceof UserCancellationException))) {
                     String text = e instanceof FirebaseUiException ? e.getMessage() :
                             getString(R.string.fui_error_unknown);
                     Toast.makeText(AuthMethodPickerActivity.this,
@@ -186,6 +187,13 @@ private void populateIdpList(List<IdpConfig> providerConfigs,
 
                     buttonLayout = R.layout.fui_provider_button_phone;
                     break;
+                case AuthUI.ANONYMOUS_PROVIDER:
+                    AnonymousSignInHandler anonymous = supplier.get(AnonymousSignInHandler.class);
+                    anonymous.init(getFlowParams());
+                    provider = anonymous;
+
+                    buttonLayout = R.layout.fui_provider_button_anonymous;
+                    break;
                 default:
                     throw new IllegalStateException("Unknown provider: " + providerId);
             }
@@ -215,8 +223,9 @@ private void handleResponse(@NonNull IdpResponse response) {
                         // started.
                         handler.startSignIn(response);
                     } else {
-                        // Email or phone: the credentials should have already been saved so simply
-                        // move along.
+                        // Email or phone: 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());
                     }
diff --git a/auth/src/main/res/drawable/fui_ic_anonymous_white_24dp.xml b/auth/src/main/res/drawable/fui_ic_anonymous_white_24dp.xml
new file mode 100644
index 000000000..212818c29
--- /dev/null
+++ b/auth/src/main/res/drawable/fui_ic_anonymous_white_24dp.xml
@@ -0,0 +1,12 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="InvalidVectorPath">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12 5.9c1.16 0 2.1.94 2.1 2.1s-0.94 2.1-2.1 2.1S9.9 9.16 9.9 8s0.94-2.1 2.1-2.1m0 9c2.97 0 6.1 1.46 6.1 2.1v1.1H5.9V17c0-0.64 3.13-2.1 6.1-2.1M12 4C9.79 4 8 5.79 8 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 9c-2.67 0-8 1.34-8 4v3h16v-3c0-2.66-5.33-4-8-4z" />
+</vector>
diff --git a/auth/src/main/res/drawable/fui_idp_button_background_anonymous.xml b/auth/src/main/res/drawable/fui_idp_button_background_anonymous.xml
new file mode 100644
index 000000000..19bf89f26
--- /dev/null
+++ b/auth/src/main/res/drawable/fui_idp_button_background_anonymous.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="3dp" />
+            <solid android:color="@color/fui_buttonShadow" />
+        </shape>
+    </item>
+    <item
+        android:bottom="@dimen/fui_button_inset_bottom"
+        android:left="@dimen/fui_button_inset_left"
+        android:right="@dimen/fui_button_inset_right"
+        android:top="@dimen/fui_button_inset_top">
+        <shape android:shape="rectangle">
+            <corners android:radius="3dp" />
+            <solid android:color="@color/fui_bgAnonymous" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/auth/src/main/res/layout/fui_provider_button_anonymous.xml b/auth/src/main/res/layout/fui_provider_button_anonymous.xml
new file mode 100644
index 000000000..361d3c007
--- /dev/null
+++ b/auth/src/main/res/layout/fui_provider_button_anonymous.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/anonymous_button"
+    style="@style/FirebaseUI.Button.AccountChooser.AnonymousButton"
+    android:text="@string/fui_sign_in_anonymously" />
diff --git a/auth/src/main/res/values/colors.xml b/auth/src/main/res/values/colors.xml
index 8b1a63aed..f3d1c1e74 100644
--- a/auth/src/main/res/values/colors.xml
+++ b/auth/src/main/res/values/colors.xml
@@ -14,5 +14,6 @@
     <color name="fui_bgGitHub">#24292E</color>
     <color name="fui_bgEmail">#D0021B</color>
     <color name="fui_bgPhone">#43C5A5</color>
+    <color name="fui_bgAnonymous">#f4b400</color>
     <color name="fui_buttonShadow">#64BEBEBE</color>
 </resources>
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index 1bc3a55e9..8eab9e43e 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -21,6 +21,7 @@
     <string name="fui_sign_in_with_github" translation_description="Sign in button text">Sign in with GitHub</string>
     <string name="fui_sign_in_with_email" translation_description="Sign in button text">Sign in with email</string>
     <string name="fui_sign_in_with_phone" translation_description="Sign in button text">Sign in with phone</string>
+    <string name="fui_sign_in_anonymously" translation_description="Continue as guest">Continue as guest</string>
 
     <!-- Email common-->
     <string name="fui_next_default" translation_description="Button text to continue">Next</string>
diff --git a/auth/src/main/res/values/styles.xml b/auth/src/main/res/values/styles.xml
index ce2877137..8a2d661f5 100644
--- a/auth/src/main/res/values/styles.xml
+++ b/auth/src/main/res/values/styles.xml
@@ -236,6 +236,12 @@
         <item name="android:textColor">#ffffff</item>
     </style>
 
+    <style name="FirebaseUI.Button.AccountChooser.AnonymousButton">
+        <item name="drawableStartCompat">@drawable/fui_ic_anonymous_white_24dp</item>
+        <item name="android:background">@drawable/fui_idp_button_background_anonymous</item>
+        <item name="android:textColor">#ffffff</item>
+    </style>
+
     <style name="FirebaseUI.TopProgressBar" parent="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">4dp</item>
diff --git a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
index e359e5a1b..b11994a10 100644
--- a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
@@ -69,12 +69,13 @@ public void testCreatingStartIntent() {
                 .setAvailableProviders(Arrays.asList(
                         new IdpConfig.EmailBuilder().build(),
                         new IdpConfig.GoogleBuilder().build(),
-                        new IdpConfig.FacebookBuilder().build()))
+                        new IdpConfig.FacebookBuilder().build(),
+                        new IdpConfig.AnonymousBuilder().build()))
                 .setTosAndPrivacyPolicyUrls(TestConstants.TOS_URL, TestConstants.PRIVACY_URL)
                 .build()
                 .getParcelableExtra(ExtraConstants.FLOW_PARAMS);
 
-        assertEquals(3, flowParameters.providerInfo.size());
+        assertEquals(4, flowParameters.providerInfo.size());
         assertEquals(TestHelper.MOCK_APP.getName(), flowParameters.appName);
         assertEquals(TestConstants.TOS_URL, flowParameters.termsOfServiceUrl);
         assertEquals(TestConstants.PRIVACY_URL, flowParameters.privacyPolicyUrl);
@@ -93,6 +94,12 @@ public void testCreatingStartIntent_withNullPp_expectEnforcesNonNullPpUrl() {
         startIntent.setTosAndPrivacyPolicyUrls(TestConstants.TOS_URL, null);
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void testCreatingStartIntent_withOnlyAnonymousProvider_expectIllegalStateException() {
+        SignInIntentBuilder startIntent = mAuthUi.createSignInIntentBuilder();
+        startIntent.setAvailableProviders(Arrays.asList(new IdpConfig.AnonymousBuilder().build()));
+    }
+
     @Test(expected = IllegalArgumentException.class)
     public void testPhoneBuilder_withBlacklistedDefaultNumberCode_expectIllegalArgumentException() {
         new IdpConfig.PhoneBuilder()
@@ -202,4 +209,11 @@ public void testPhoneBuilder_passNullForBlacklistedCountries_expectNullPointerEx
                 .setBlacklistedCountries(null)
                 .build();
     }
+
+    @Test
+    public void testAnonymousBuilder_expectSucess() {
+        new IdpConfig.AnonymousBuilder()
+                .build();
+    }
+
 }
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 45a79924f..6ca3d5fa5 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
@@ -126,6 +126,9 @@ public static FlowParameters getFlowParameters(Collection<String> providerIds,
                 case PhoneAuthProvider.PROVIDER_ID:
                     idpConfigs.add(new IdpConfig.PhoneBuilder().build());
                     break;
+                case AuthUI.ANONYMOUS_PROVIDER:
+                    idpConfigs.add(new IdpConfig.AnonymousBuilder().build());
+                    break;
                 default:
                     throw new IllegalArgumentException("Unknown provider: " + providerId);
             }
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 50b8ccc9b..9da3b2a73 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
@@ -18,6 +18,7 @@
 import android.widget.Button;
 import android.widget.LinearLayout;
 
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.testhelpers.TestHelper;
 import com.firebase.ui.auth.ui.email.EmailActivity;
@@ -56,13 +57,14 @@ public void testAllProvidersArePopulated() {
                 GoogleAuthProvider.PROVIDER_ID,
                 TwitterAuthProvider.PROVIDER_ID,
                 EmailAuthProvider.PROVIDER_ID,
-                PhoneAuthProvider.PROVIDER_ID);
+                PhoneAuthProvider.PROVIDER_ID,
+                AuthUI.ANONYMOUS_PROVIDER);
 
         AuthMethodPickerActivity authMethodPickerActivity = createActivity(providers);
 
         assertEquals(providers.size(),
-                     ((LinearLayout) authMethodPickerActivity.findViewById(R.id.btn_holder))
-                             .getChildCount());
+                ((LinearLayout) authMethodPickerActivity.findViewById(R.id.btn_holder))
+                        .getChildCount());
     }
 
     @Test
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
new file mode 100644
index 000000000..57d6696b3
--- /dev/null
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/AnonymousSignInHandlerTest.java
@@ -0,0 +1,98 @@
+package com.firebase.ui.auth.viewmodel;
+
+import android.arch.lifecycle.Observer;
+
+import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.data.model.FlowParameters;
+import com.firebase.ui.auth.data.model.Resource;
+import com.firebase.ui.auth.data.model.State;
+import com.firebase.ui.auth.data.remote.AnonymousSignInHandler;
+import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
+import com.firebase.ui.auth.testhelpers.FakeAuthResult;
+import com.firebase.ui.auth.testhelpers.ResourceMatchers;
+import com.firebase.ui.auth.testhelpers.TestHelper;
+import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.FirebaseAuth;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit tests for {@link AnonymousSignInHandler}.
+ */
+@RunWith(RobolectricTestRunner.class)
+public class AnonymousSignInHandlerTest {
+
+    @Mock FirebaseAuth mMockAuth;
+    AnonymousSignInHandler mHandler;
+
+    @Mock Observer<Resource<IdpResponse>> mResponseObserver;
+
+    @Before
+    public void setUp() {
+        TestHelper.initialize();
+        MockitoAnnotations.initMocks(this);
+
+        mHandler = new AnonymousSignInHandler(RuntimeEnvironment.application);
+        FlowParameters testParams = TestHelper.getFlowParameters(new ArrayList<String>());
+        mHandler.init(testParams);
+        mHandler.mAuth = mMockAuth;
+    }
+
+    @Test
+    public void testStartSignIn_expectSuccess() {
+        mHandler.getOperation().observeForever(mResponseObserver);
+
+        when(mMockAuth.signInAnonymously())
+                .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
+
+        mHandler.startSignIn(null);
+
+        verify(mMockAuth).signInAnonymously();
+
+        InOrder inOrder = inOrder(mResponseObserver);
+        inOrder.verify(mResponseObserver)
+                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
+
+        ArgumentCaptor<Resource<IdpResponse>> captor = ArgumentCaptor.forClass(Resource.class);
+        inOrder.verify(mResponseObserver).onChanged(captor.capture());
+
+        assertThat(captor.getValue().getState()).isEqualTo(State.SUCCESS);
+        IdpResponse response = captor.getValue().getValue();
+        assertThat(response.isNewUser()).isFalse();
+    }
+
+    @Test
+    public void testStartSignIn_expectFailure() {
+        mHandler.getOperation().observeForever(mResponseObserver);
+
+        when(mMockAuth.signInAnonymously())
+                .thenReturn(AutoCompleteTask.<AuthResult>forFailure(new Exception("FAILED")));
+
+        mHandler.startSignIn(null);
+
+        verify(mMockAuth).signInAnonymously();
+
+        InOrder inOrder = inOrder(mResponseObserver);
+        inOrder.verify(mResponseObserver)
+                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
+        inOrder.verify(mResponseObserver)
+                .onChanged(argThat(ResourceMatchers.<IdpResponse>isFailure()));
+
+    }
+}
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 068f9c38a..d8686a2a2 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
@@ -22,7 +22,6 @@
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthCredential;
 import com.google.firebase.auth.GoogleAuthProvider;
-import com.google.firebase.auth.PhoneAuthCredential;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -59,7 +58,6 @@ public class LinkingSocialProviderResponseHandlerTest {
     @Mock FirebaseAuth mScratchMockAuth;
 
     @Mock FirebaseUser mMockUser;
-    @Mock PhoneAuthCredential mCredential;
     @Mock Observer<Resource<IdpResponse>> mResponseObserver;
 
     private LinkingSocialProviderResponseHandler mHandler;
diff --git a/library/quality/lint-baseline.xml b/library/quality/lint-baseline.xml
index 3e6a355dd..3217e43a5 100644
--- a/library/quality/lint-baseline.xml
+++ b/library/quality/lint-baseline.xml
@@ -7,5 +7,4 @@
         message="The project references RTL attributes, but does not explicitly enable or disable RTL support with `android:supportsRtl` in the manifest">
         <location file="src/main/AndroidManifest.xml" />
     </issue>
-
 </issues>

From 0c13d77e7815894a7f444df59a6ee487c8711f06 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Wed, 4 Jul 2018 07:18:52 -0700
Subject: [PATCH 23/28] Speed up full build (#1386)

---
 proguard-tests/build.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/proguard-tests/build.gradle.kts b/proguard-tests/build.gradle.kts
index 0ff13f9bc..8ddd9a662 100644
--- a/proguard-tests/build.gradle.kts
+++ b/proguard-tests/build.gradle.kts
@@ -13,7 +13,6 @@ android {
                 isRemoveUnusedCode = true
                 isRemoveUnusedResources = true
                 isObfuscate = true
-                isOptimizeCode = true
             }
         }
     }

From a108176e6d2ae9c475f3eea12987ed2d7fd823dd Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Mon, 9 Jul 2018 10:57:12 -0700
Subject: [PATCH 24/28] Translations for continue as guest (#1390)

---
 auth/build.gradle.kts                         | 1 -
 auth/src/main/res/values-ar/strings.xml       | 1 +
 auth/src/main/res/values-b+es+419/strings.xml | 1 +
 auth/src/main/res/values-bg/strings.xml       | 1 +
 auth/src/main/res/values-bn/strings.xml       | 1 +
 auth/src/main/res/values-ca/strings.xml       | 1 +
 auth/src/main/res/values-cs/strings.xml       | 1 +
 auth/src/main/res/values-da/strings.xml       | 1 +
 auth/src/main/res/values-de-rAT/strings.xml   | 1 +
 auth/src/main/res/values-de-rCH/strings.xml   | 1 +
 auth/src/main/res/values-de/strings.xml       | 1 +
 auth/src/main/res/values-el/strings.xml       | 1 +
 auth/src/main/res/values-en-rAU/strings.xml   | 1 +
 auth/src/main/res/values-en-rCA/strings.xml   | 1 +
 auth/src/main/res/values-en-rGB/strings.xml   | 1 +
 auth/src/main/res/values-en-rIE/strings.xml   | 1 +
 auth/src/main/res/values-en-rIN/strings.xml   | 1 +
 auth/src/main/res/values-en-rSG/strings.xml   | 1 +
 auth/src/main/res/values-en-rZA/strings.xml   | 1 +
 auth/src/main/res/values-es-rAR/strings.xml   | 1 +
 auth/src/main/res/values-es-rBO/strings.xml   | 1 +
 auth/src/main/res/values-es-rCL/strings.xml   | 1 +
 auth/src/main/res/values-es-rCO/strings.xml   | 1 +
 auth/src/main/res/values-es-rCR/strings.xml   | 1 +
 auth/src/main/res/values-es-rDO/strings.xml   | 1 +
 auth/src/main/res/values-es-rEC/strings.xml   | 1 +
 auth/src/main/res/values-es-rGT/strings.xml   | 1 +
 auth/src/main/res/values-es-rHN/strings.xml   | 1 +
 auth/src/main/res/values-es-rMX/strings.xml   | 1 +
 auth/src/main/res/values-es-rNI/strings.xml   | 1 +
 auth/src/main/res/values-es-rPA/strings.xml   | 1 +
 auth/src/main/res/values-es-rPE/strings.xml   | 1 +
 auth/src/main/res/values-es-rPR/strings.xml   | 1 +
 auth/src/main/res/values-es-rPY/strings.xml   | 1 +
 auth/src/main/res/values-es-rSV/strings.xml   | 1 +
 auth/src/main/res/values-es-rUS/strings.xml   | 1 +
 auth/src/main/res/values-es-rUY/strings.xml   | 1 +
 auth/src/main/res/values-es-rVE/strings.xml   | 1 +
 auth/src/main/res/values-es/strings.xml       | 1 +
 auth/src/main/res/values-fa/strings.xml       | 1 +
 auth/src/main/res/values-fi/strings.xml       | 1 +
 auth/src/main/res/values-fil/strings.xml      | 1 +
 auth/src/main/res/values-fr-rCH/strings.xml   | 1 +
 auth/src/main/res/values-fr/strings.xml       | 1 +
 auth/src/main/res/values-gsw/strings.xml      | 1 +
 auth/src/main/res/values-gu/strings.xml       | 1 +
 auth/src/main/res/values-hi/strings.xml       | 1 +
 auth/src/main/res/values-hr/strings.xml       | 1 +
 auth/src/main/res/values-hu/strings.xml       | 1 +
 auth/src/main/res/values-in/strings.xml       | 1 +
 auth/src/main/res/values-it/strings.xml       | 1 +
 auth/src/main/res/values-iw/strings.xml       | 1 +
 auth/src/main/res/values-ja/strings.xml       | 1 +
 auth/src/main/res/values-kn/strings.xml       | 1 +
 auth/src/main/res/values-ko/strings.xml       | 1 +
 auth/src/main/res/values-ln/strings.xml       | 1 +
 auth/src/main/res/values-lt/strings.xml       | 1 +
 auth/src/main/res/values-lv/strings.xml       | 1 +
 auth/src/main/res/values-mo/strings.xml       | 1 +
 auth/src/main/res/values-mr/strings.xml       | 1 +
 auth/src/main/res/values-ms/strings.xml       | 1 +
 auth/src/main/res/values-nb/strings.xml       | 1 +
 auth/src/main/res/values-nl/strings.xml       | 1 +
 auth/src/main/res/values-no/strings.xml       | 1 +
 auth/src/main/res/values-pl/strings.xml       | 1 +
 auth/src/main/res/values-pt-rBR/strings.xml   | 1 +
 auth/src/main/res/values-pt-rPT/strings.xml   | 1 +
 auth/src/main/res/values-pt/strings.xml       | 1 +
 auth/src/main/res/values-ro/strings.xml       | 1 +
 auth/src/main/res/values-ru/strings.xml       | 1 +
 auth/src/main/res/values-sk/strings.xml       | 1 +
 auth/src/main/res/values-sl/strings.xml       | 1 +
 auth/src/main/res/values-sr/strings.xml       | 1 +
 auth/src/main/res/values-sv/strings.xml       | 1 +
 auth/src/main/res/values-ta/strings.xml       | 1 +
 auth/src/main/res/values-th/strings.xml       | 1 +
 auth/src/main/res/values-tl/strings.xml       | 1 +
 auth/src/main/res/values-tr/strings.xml       | 1 +
 auth/src/main/res/values-uk/strings.xml       | 1 +
 auth/src/main/res/values-ur/strings.xml       | 1 +
 auth/src/main/res/values-vi/strings.xml       | 1 +
 auth/src/main/res/values-zh-rCN/strings.xml   | 1 +
 auth/src/main/res/values-zh-rHK/strings.xml   | 1 +
 auth/src/main/res/values-zh-rTW/strings.xml   | 1 +
 auth/src/main/res/values-zh/strings.xml       | 1 +
 docs/internal/translations.md                 | 2 +-
 86 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 59b960bb3..15914a4ba 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -12,7 +12,6 @@ android {
 
     lintOptions {
         disable("UnusedQuantity")
-        disable("MissingTranslation") // TODO: Translate fui_auto_verified
     }
 
     testOptions {
diff --git a/auth/src/main/res/values-ar/strings.xml b/auth/src/main/res/values-ar/strings.xml
index 30334a2a6..2d08f7a0c 100755
--- a/auth/src/main/res/values-ar/strings.xml
+++ b/auth/src/main/res/values-ar/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">تسجيل الدخول باستخدام GitHub</string>
     <string name="fui_sign_in_with_email">تسجيل الدخول عبر البريد الإلكتروني</string>
     <string name="fui_sign_in_with_phone">تسجيل الدخول عبر رقم الهاتف</string>
+    <string name="fui_sign_in_anonymously">المتابعة كضيف</string>
     <string name="fui_next_default">التالي</string>
     <string name="fui_email_hint">البريد الإلكتروني</string>
     <string name="fui_phone_hint">رقم الهاتف</string>
diff --git a/auth/src/main/res/values-b+es+419/strings.xml b/auth/src/main/res/values-b+es+419/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-b+es+419/strings.xml
+++ b/auth/src/main/res/values-b+es+419/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-bg/strings.xml b/auth/src/main/res/values-bg/strings.xml
index a3a67a10a..01c709045 100755
--- a/auth/src/main/res/values-bg/strings.xml
+++ b/auth/src/main/res/values-bg/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Вход с GitHub</string>
     <string name="fui_sign_in_with_email">Вход с имейл</string>
     <string name="fui_sign_in_with_phone">Вход с телефон</string>
+    <string name="fui_sign_in_anonymously">Продължаване като гост</string>
     <string name="fui_next_default">Напред</string>
     <string name="fui_email_hint">Имейл</string>
     <string name="fui_phone_hint">Телефонен номер</string>
diff --git a/auth/src/main/res/values-bn/strings.xml b/auth/src/main/res/values-bn/strings.xml
index 340eb0429..80dbc4f92 100755
--- a/auth/src/main/res/values-bn/strings.xml
+++ b/auth/src/main/res/values-bn/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">GitHub ব্যবহার করে সাইন-ইন করুন</string>
     <string name="fui_sign_in_with_email">ইমেল দিয়ে সাইন-ইন করুন</string>
     <string name="fui_sign_in_with_phone">ফোন দিয়ে সাইন-ইন করুন</string>
+    <string name="fui_sign_in_anonymously">অতিথি হিসেবে চালিয়ে যান</string>
     <string name="fui_next_default">পরবর্তী</string>
     <string name="fui_email_hint">ইমেল</string>
     <string name="fui_phone_hint">ফোন নম্বর</string>
diff --git a/auth/src/main/res/values-ca/strings.xml b/auth/src/main/res/values-ca/strings.xml
index 0539229f8..fbbd1e0ec 100755
--- a/auth/src/main/res/values-ca/strings.xml
+++ b/auth/src/main/res/values-ca/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Inicia la sessió amb GitHub</string>
     <string name="fui_sign_in_with_email">Inicia la sessió amb l\'adreça electrònica</string>
     <string name="fui_sign_in_with_phone">Inicia la sessió amb el telèfon</string>
+    <string name="fui_sign_in_anonymously">Continua com a convidat</string>
     <string name="fui_next_default">Següent</string>
     <string name="fui_email_hint">Adreça electrònica</string>
     <string name="fui_phone_hint">Número de telèfon</string>
diff --git a/auth/src/main/res/values-cs/strings.xml b/auth/src/main/res/values-cs/strings.xml
index e2c818e04..90082b66e 100755
--- a/auth/src/main/res/values-cs/strings.xml
+++ b/auth/src/main/res/values-cs/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Přihlásit se přes GitHub</string>
     <string name="fui_sign_in_with_email">Přihlásit se pomocí e-mailu</string>
     <string name="fui_sign_in_with_phone">Přihlásit se pomocí telefonu</string>
+    <string name="fui_sign_in_anonymously">Pokračovat jako host</string>
     <string name="fui_next_default">Další</string>
     <string name="fui_email_hint">E-mail</string>
     <string name="fui_phone_hint">Telefonní číslo</string>
diff --git a/auth/src/main/res/values-da/strings.xml b/auth/src/main/res/values-da/strings.xml
index 9eb0b6061..d15057b74 100755
--- a/auth/src/main/res/values-da/strings.xml
+++ b/auth/src/main/res/values-da/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Log ind med GitHub</string>
     <string name="fui_sign_in_with_email">Log ind med mail</string>
     <string name="fui_sign_in_with_phone">Log ind med telefon</string>
+    <string name="fui_sign_in_anonymously">Fortsæt som gæst</string>
     <string name="fui_next_default">Næste</string>
     <string name="fui_email_hint">Mail</string>
     <string name="fui_phone_hint">Telefonnummer</string>
diff --git a/auth/src/main/res/values-de-rAT/strings.xml b/auth/src/main/res/values-de-rAT/strings.xml
index ed621c961..1972b4fea 100755
--- a/auth/src/main/res/values-de-rAT/strings.xml
+++ b/auth/src/main/res/values-de-rAT/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Über GitHub anmelden</string>
     <string name="fui_sign_in_with_email">Mit einer E-Mail-Adresse anmelden</string>
     <string name="fui_sign_in_with_phone">Mit einer Telefonnummer anmelden</string>
+    <string name="fui_sign_in_anonymously">Als Gast fortfahren</string>
     <string name="fui_next_default">Weiter</string>
     <string name="fui_email_hint">E-Mail-Adresse</string>
     <string name="fui_phone_hint">Telefonnummer</string>
diff --git a/auth/src/main/res/values-de-rCH/strings.xml b/auth/src/main/res/values-de-rCH/strings.xml
index ed621c961..1972b4fea 100755
--- a/auth/src/main/res/values-de-rCH/strings.xml
+++ b/auth/src/main/res/values-de-rCH/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Über GitHub anmelden</string>
     <string name="fui_sign_in_with_email">Mit einer E-Mail-Adresse anmelden</string>
     <string name="fui_sign_in_with_phone">Mit einer Telefonnummer anmelden</string>
+    <string name="fui_sign_in_anonymously">Als Gast fortfahren</string>
     <string name="fui_next_default">Weiter</string>
     <string name="fui_email_hint">E-Mail-Adresse</string>
     <string name="fui_phone_hint">Telefonnummer</string>
diff --git a/auth/src/main/res/values-de/strings.xml b/auth/src/main/res/values-de/strings.xml
index ed621c961..1972b4fea 100755
--- a/auth/src/main/res/values-de/strings.xml
+++ b/auth/src/main/res/values-de/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Über GitHub anmelden</string>
     <string name="fui_sign_in_with_email">Mit einer E-Mail-Adresse anmelden</string>
     <string name="fui_sign_in_with_phone">Mit einer Telefonnummer anmelden</string>
+    <string name="fui_sign_in_anonymously">Als Gast fortfahren</string>
     <string name="fui_next_default">Weiter</string>
     <string name="fui_email_hint">E-Mail-Adresse</string>
     <string name="fui_phone_hint">Telefonnummer</string>
diff --git a/auth/src/main/res/values-el/strings.xml b/auth/src/main/res/values-el/strings.xml
index d37fcf26f..ce56ca9ea 100755
--- a/auth/src/main/res/values-el/strings.xml
+++ b/auth/src/main/res/values-el/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Σύνδεση μέσω GitHub</string>
     <string name="fui_sign_in_with_email">Σύνδεση μέσω ηλεκτρονικού ταχυδρομείου</string>
     <string name="fui_sign_in_with_phone">Σύνδεση μέσω τηλεφώνου</string>
+    <string name="fui_sign_in_anonymously">Συνέχεια ως επισκέπτης</string>
     <string name="fui_next_default">Επόμενο</string>
     <string name="fui_email_hint">Ηλεκτρονικό ταχυδρομείο</string>
     <string name="fui_phone_hint">Αριθμός τηλεφώνου</string>
diff --git a/auth/src/main/res/values-en-rAU/strings.xml b/auth/src/main/res/values-en-rAU/strings.xml
index 3f77e4877..b9180e5d2 100755
--- a/auth/src/main/res/values-en-rAU/strings.xml
+++ b/auth/src/main/res/values-en-rAU/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Sign in with GitHub</string>
     <string name="fui_sign_in_with_email">Sign in with email</string>
     <string name="fui_sign_in_with_phone">Sign in with phone</string>
+    <string name="fui_sign_in_anonymously">Continue as a guest</string>
     <string name="fui_next_default">Next</string>
     <string name="fui_email_hint">Email</string>
     <string name="fui_phone_hint">Phone number</string>
diff --git a/auth/src/main/res/values-en-rCA/strings.xml b/auth/src/main/res/values-en-rCA/strings.xml
index 3f77e4877..b9180e5d2 100755
--- a/auth/src/main/res/values-en-rCA/strings.xml
+++ b/auth/src/main/res/values-en-rCA/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Sign in with GitHub</string>
     <string name="fui_sign_in_with_email">Sign in with email</string>
     <string name="fui_sign_in_with_phone">Sign in with phone</string>
+    <string name="fui_sign_in_anonymously">Continue as a guest</string>
     <string name="fui_next_default">Next</string>
     <string name="fui_email_hint">Email</string>
     <string name="fui_phone_hint">Phone number</string>
diff --git a/auth/src/main/res/values-en-rGB/strings.xml b/auth/src/main/res/values-en-rGB/strings.xml
index 3f77e4877..b9180e5d2 100755
--- a/auth/src/main/res/values-en-rGB/strings.xml
+++ b/auth/src/main/res/values-en-rGB/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Sign in with GitHub</string>
     <string name="fui_sign_in_with_email">Sign in with email</string>
     <string name="fui_sign_in_with_phone">Sign in with phone</string>
+    <string name="fui_sign_in_anonymously">Continue as a guest</string>
     <string name="fui_next_default">Next</string>
     <string name="fui_email_hint">Email</string>
     <string name="fui_phone_hint">Phone number</string>
diff --git a/auth/src/main/res/values-en-rIE/strings.xml b/auth/src/main/res/values-en-rIE/strings.xml
index 3f77e4877..b9180e5d2 100755
--- a/auth/src/main/res/values-en-rIE/strings.xml
+++ b/auth/src/main/res/values-en-rIE/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Sign in with GitHub</string>
     <string name="fui_sign_in_with_email">Sign in with email</string>
     <string name="fui_sign_in_with_phone">Sign in with phone</string>
+    <string name="fui_sign_in_anonymously">Continue as a guest</string>
     <string name="fui_next_default">Next</string>
     <string name="fui_email_hint">Email</string>
     <string name="fui_phone_hint">Phone number</string>
diff --git a/auth/src/main/res/values-en-rIN/strings.xml b/auth/src/main/res/values-en-rIN/strings.xml
index 3f77e4877..b9180e5d2 100755
--- a/auth/src/main/res/values-en-rIN/strings.xml
+++ b/auth/src/main/res/values-en-rIN/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Sign in with GitHub</string>
     <string name="fui_sign_in_with_email">Sign in with email</string>
     <string name="fui_sign_in_with_phone">Sign in with phone</string>
+    <string name="fui_sign_in_anonymously">Continue as a guest</string>
     <string name="fui_next_default">Next</string>
     <string name="fui_email_hint">Email</string>
     <string name="fui_phone_hint">Phone number</string>
diff --git a/auth/src/main/res/values-en-rSG/strings.xml b/auth/src/main/res/values-en-rSG/strings.xml
index 3f77e4877..b9180e5d2 100755
--- a/auth/src/main/res/values-en-rSG/strings.xml
+++ b/auth/src/main/res/values-en-rSG/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Sign in with GitHub</string>
     <string name="fui_sign_in_with_email">Sign in with email</string>
     <string name="fui_sign_in_with_phone">Sign in with phone</string>
+    <string name="fui_sign_in_anonymously">Continue as a guest</string>
     <string name="fui_next_default">Next</string>
     <string name="fui_email_hint">Email</string>
     <string name="fui_phone_hint">Phone number</string>
diff --git a/auth/src/main/res/values-en-rZA/strings.xml b/auth/src/main/res/values-en-rZA/strings.xml
index 3f77e4877..b9180e5d2 100755
--- a/auth/src/main/res/values-en-rZA/strings.xml
+++ b/auth/src/main/res/values-en-rZA/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Sign in with GitHub</string>
     <string name="fui_sign_in_with_email">Sign in with email</string>
     <string name="fui_sign_in_with_phone">Sign in with phone</string>
+    <string name="fui_sign_in_anonymously">Continue as a guest</string>
     <string name="fui_next_default">Next</string>
     <string name="fui_email_hint">Email</string>
     <string name="fui_phone_hint">Phone number</string>
diff --git a/auth/src/main/res/values-es-rAR/strings.xml b/auth/src/main/res/values-es-rAR/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rAR/strings.xml
+++ b/auth/src/main/res/values-es-rAR/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rBO/strings.xml b/auth/src/main/res/values-es-rBO/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rBO/strings.xml
+++ b/auth/src/main/res/values-es-rBO/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rCL/strings.xml b/auth/src/main/res/values-es-rCL/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rCL/strings.xml
+++ b/auth/src/main/res/values-es-rCL/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rCO/strings.xml b/auth/src/main/res/values-es-rCO/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rCO/strings.xml
+++ b/auth/src/main/res/values-es-rCO/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rCR/strings.xml b/auth/src/main/res/values-es-rCR/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rCR/strings.xml
+++ b/auth/src/main/res/values-es-rCR/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rDO/strings.xml b/auth/src/main/res/values-es-rDO/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rDO/strings.xml
+++ b/auth/src/main/res/values-es-rDO/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rEC/strings.xml b/auth/src/main/res/values-es-rEC/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rEC/strings.xml
+++ b/auth/src/main/res/values-es-rEC/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rGT/strings.xml b/auth/src/main/res/values-es-rGT/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rGT/strings.xml
+++ b/auth/src/main/res/values-es-rGT/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rHN/strings.xml b/auth/src/main/res/values-es-rHN/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rHN/strings.xml
+++ b/auth/src/main/res/values-es-rHN/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rMX/strings.xml b/auth/src/main/res/values-es-rMX/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rMX/strings.xml
+++ b/auth/src/main/res/values-es-rMX/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rNI/strings.xml b/auth/src/main/res/values-es-rNI/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rNI/strings.xml
+++ b/auth/src/main/res/values-es-rNI/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rPA/strings.xml b/auth/src/main/res/values-es-rPA/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rPA/strings.xml
+++ b/auth/src/main/res/values-es-rPA/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rPE/strings.xml b/auth/src/main/res/values-es-rPE/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rPE/strings.xml
+++ b/auth/src/main/res/values-es-rPE/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rPR/strings.xml b/auth/src/main/res/values-es-rPR/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rPR/strings.xml
+++ b/auth/src/main/res/values-es-rPR/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rPY/strings.xml b/auth/src/main/res/values-es-rPY/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rPY/strings.xml
+++ b/auth/src/main/res/values-es-rPY/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rSV/strings.xml b/auth/src/main/res/values-es-rSV/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rSV/strings.xml
+++ b/auth/src/main/res/values-es-rSV/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rUS/strings.xml b/auth/src/main/res/values-es-rUS/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rUS/strings.xml
+++ b/auth/src/main/res/values-es-rUS/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rUY/strings.xml b/auth/src/main/res/values-es-rUY/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rUY/strings.xml
+++ b/auth/src/main/res/values-es-rUY/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es-rVE/strings.xml b/auth/src/main/res/values-es-rVE/strings.xml
index 7d63da241..76de343b4 100755
--- a/auth/src/main/res/values-es-rVE/strings.xml
+++ b/auth/src/main/res/values-es-rVE/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Acceder con GitHub</string>
     <string name="fui_sign_in_with_email">Acceder con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Acceder con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-es/strings.xml b/auth/src/main/res/values-es/strings.xml
index 960d42bcf..5914c9c95 100755
--- a/auth/src/main/res/values-es/strings.xml
+++ b/auth/src/main/res/values-es/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Iniciar sesión con GitHub</string>
     <string name="fui_sign_in_with_email">Iniciar sesión con el correo electrónico</string>
     <string name="fui_sign_in_with_phone">Iniciar sesión con el teléfono</string>
+    <string name="fui_sign_in_anonymously">Continuar como invitado</string>
     <string name="fui_next_default">Siguiente</string>
     <string name="fui_email_hint">Correo electrónico</string>
     <string name="fui_phone_hint">Número de teléfono</string>
diff --git a/auth/src/main/res/values-fa/strings.xml b/auth/src/main/res/values-fa/strings.xml
index 9ea43bb1e..d1b1ecdeb 100755
--- a/auth/src/main/res/values-fa/strings.xml
+++ b/auth/src/main/res/values-fa/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">ورود به سیستم با GitHub</string>
     <string name="fui_sign_in_with_email">ورود به سیستم با رایانامه</string>
     <string name="fui_sign_in_with_phone">ورود به سیستم با تلفن</string>
+    <string name="fui_sign_in_anonymously">ادامه به‌عنوان مهمان</string>
     <string name="fui_next_default">بعدی</string>
     <string name="fui_email_hint">رایانامه</string>
     <string name="fui_phone_hint">شماره تلفن</string>
diff --git a/auth/src/main/res/values-fi/strings.xml b/auth/src/main/res/values-fi/strings.xml
index 6e5d776fa..166dd3b0c 100755
--- a/auth/src/main/res/values-fi/strings.xml
+++ b/auth/src/main/res/values-fi/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Kirjaudu GitHub-tilillä</string>
     <string name="fui_sign_in_with_email">Kirjaudu sähköpostilla</string>
     <string name="fui_sign_in_with_phone">Kirjaudu puhelimella</string>
+    <string name="fui_sign_in_anonymously">Jatka vieraana</string>
     <string name="fui_next_default">Seuraava</string>
     <string name="fui_email_hint">Sähköposti</string>
     <string name="fui_phone_hint">Puhelinnumero</string>
diff --git a/auth/src/main/res/values-fil/strings.xml b/auth/src/main/res/values-fil/strings.xml
index e9a8de2de..c6cf6f60b 100755
--- a/auth/src/main/res/values-fil/strings.xml
+++ b/auth/src/main/res/values-fil/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Mag-sign in sa GitHub</string>
     <string name="fui_sign_in_with_email">Mag-sign in gamit ang email</string>
     <string name="fui_sign_in_with_phone">Mag-sign in gamit ang telepono</string>
+    <string name="fui_sign_in_anonymously">Magpatuloy bilang bisita</string>
     <string name="fui_next_default">Susunod</string>
     <string name="fui_email_hint">Mag-email</string>
     <string name="fui_phone_hint">Numero ng Telepono</string>
diff --git a/auth/src/main/res/values-fr-rCH/strings.xml b/auth/src/main/res/values-fr-rCH/strings.xml
index 747acacae..308e54891 100755
--- a/auth/src/main/res/values-fr-rCH/strings.xml
+++ b/auth/src/main/res/values-fr-rCH/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Se connecter avec GitHub</string>
     <string name="fui_sign_in_with_email">Se connecter avec une adresse e-mail</string>
     <string name="fui_sign_in_with_phone">Se connecter avec un téléphone</string>
+    <string name="fui_sign_in_anonymously">Continuer en tant qu\'invité</string>
     <string name="fui_next_default">Suivant</string>
     <string name="fui_email_hint">E-mail</string>
     <string name="fui_phone_hint">Numéro de téléphone</string>
diff --git a/auth/src/main/res/values-fr/strings.xml b/auth/src/main/res/values-fr/strings.xml
index 747acacae..308e54891 100755
--- a/auth/src/main/res/values-fr/strings.xml
+++ b/auth/src/main/res/values-fr/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Se connecter avec GitHub</string>
     <string name="fui_sign_in_with_email">Se connecter avec une adresse e-mail</string>
     <string name="fui_sign_in_with_phone">Se connecter avec un téléphone</string>
+    <string name="fui_sign_in_anonymously">Continuer en tant qu\'invité</string>
     <string name="fui_next_default">Suivant</string>
     <string name="fui_email_hint">E-mail</string>
     <string name="fui_phone_hint">Numéro de téléphone</string>
diff --git a/auth/src/main/res/values-gsw/strings.xml b/auth/src/main/res/values-gsw/strings.xml
index ed621c961..1972b4fea 100755
--- a/auth/src/main/res/values-gsw/strings.xml
+++ b/auth/src/main/res/values-gsw/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Über GitHub anmelden</string>
     <string name="fui_sign_in_with_email">Mit einer E-Mail-Adresse anmelden</string>
     <string name="fui_sign_in_with_phone">Mit einer Telefonnummer anmelden</string>
+    <string name="fui_sign_in_anonymously">Als Gast fortfahren</string>
     <string name="fui_next_default">Weiter</string>
     <string name="fui_email_hint">E-Mail-Adresse</string>
     <string name="fui_phone_hint">Telefonnummer</string>
diff --git a/auth/src/main/res/values-gu/strings.xml b/auth/src/main/res/values-gu/strings.xml
index 4fbd261d9..69bd1a58f 100755
--- a/auth/src/main/res/values-gu/strings.xml
+++ b/auth/src/main/res/values-gu/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">GitHub વડે સાઇન ઇન કરો</string>
     <string name="fui_sign_in_with_email">ઇમેઇલ વડે સાઇન ઇન કરો</string>
     <string name="fui_sign_in_with_phone">ફોન વડે સાઇન ઇન કરો</string>
+    <string name="fui_sign_in_anonymously">અતિથિ તરીકે ચાલુ રાખો</string>
     <string name="fui_next_default">આગળ</string>
     <string name="fui_email_hint">ઇમેઇલ</string>
     <string name="fui_phone_hint">ફોન નંબર</string>
diff --git a/auth/src/main/res/values-hi/strings.xml b/auth/src/main/res/values-hi/strings.xml
index 4622c179e..1a4998d2c 100755
--- a/auth/src/main/res/values-hi/strings.xml
+++ b/auth/src/main/res/values-hi/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">GitHub के साथ साइन इन करें</string>
     <string name="fui_sign_in_with_email">ईमेल से प्रवेश करें</string>
     <string name="fui_sign_in_with_phone">फ़ोन से प्रवेश करें</string>
+    <string name="fui_sign_in_anonymously">मेहमान के रूप में जारी रखें</string>
     <string name="fui_next_default">अगला</string>
     <string name="fui_email_hint">ईमेल</string>
     <string name="fui_phone_hint">फ़ोन नंबर</string>
diff --git a/auth/src/main/res/values-hr/strings.xml b/auth/src/main/res/values-hr/strings.xml
index b677fe535..4dac58ef2 100755
--- a/auth/src/main/res/values-hr/strings.xml
+++ b/auth/src/main/res/values-hr/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Prijava putem GitHuba</string>
     <string name="fui_sign_in_with_email">Prijava putem e-adrese</string>
     <string name="fui_sign_in_with_phone">Prijava putem telefona</string>
+    <string name="fui_sign_in_anonymously">Nastavi kao gost</string>
     <string name="fui_next_default">Dalje</string>
     <string name="fui_email_hint">E-adresa</string>
     <string name="fui_phone_hint">Telefonski broj</string>
diff --git a/auth/src/main/res/values-hu/strings.xml b/auth/src/main/res/values-hu/strings.xml
index 0a1dcf73a..46789fbb0 100755
--- a/auth/src/main/res/values-hu/strings.xml
+++ b/auth/src/main/res/values-hu/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Bejelentkezés GitHubbal</string>
     <string name="fui_sign_in_with_email">Bejelentkezés e-mail-fiókkal</string>
     <string name="fui_sign_in_with_phone">Bejelentkezés telefonnal</string>
+    <string name="fui_sign_in_anonymously">Folytatás vendégként</string>
     <string name="fui_next_default">Következő</string>
     <string name="fui_email_hint">E-mail</string>
     <string name="fui_phone_hint">Telefonszám</string>
diff --git a/auth/src/main/res/values-in/strings.xml b/auth/src/main/res/values-in/strings.xml
index 4cc582a4e..f773ded65 100755
--- a/auth/src/main/res/values-in/strings.xml
+++ b/auth/src/main/res/values-in/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Login dengan GitHub</string>
     <string name="fui_sign_in_with_email">Login dengan email</string>
     <string name="fui_sign_in_with_phone">Login dengan nomor telepon</string>
+    <string name="fui_sign_in_anonymously">Lanjutkan sebagai tamu</string>
     <string name="fui_next_default">Berikutnya</string>
     <string name="fui_email_hint">Email</string>
     <string name="fui_phone_hint">Nomor Telepon</string>
diff --git a/auth/src/main/res/values-it/strings.xml b/auth/src/main/res/values-it/strings.xml
index 4f649ef95..feafccc4b 100755
--- a/auth/src/main/res/values-it/strings.xml
+++ b/auth/src/main/res/values-it/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Accedi con GitHub</string>
     <string name="fui_sign_in_with_email">Accedi con l\'indirizzo email</string>
     <string name="fui_sign_in_with_phone">Accedi con il telefono</string>
+    <string name="fui_sign_in_anonymously">Continua come ospite</string>
     <string name="fui_next_default">Avanti</string>
     <string name="fui_email_hint">Indirizzo email</string>
     <string name="fui_phone_hint">Numero di telefono</string>
diff --git a/auth/src/main/res/values-iw/strings.xml b/auth/src/main/res/values-iw/strings.xml
index 8b9aa2e7d..ab2e8baaa 100755
--- a/auth/src/main/res/values-iw/strings.xml
+++ b/auth/src/main/res/values-iw/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">כניסה באמצעות GitHub</string>
     <string name="fui_sign_in_with_email">כניסה באמצעות אימייל</string>
     <string name="fui_sign_in_with_phone">כניסה באמצעות הטלפון</string>
+    <string name="fui_sign_in_anonymously">המשך כאורח</string>
     <string name="fui_next_default">הבא‏</string>
     <string name="fui_email_hint">אימייל</string>
     <string name="fui_phone_hint">מספר טלפון</string>
diff --git a/auth/src/main/res/values-ja/strings.xml b/auth/src/main/res/values-ja/strings.xml
index b642db63a..5a94f2958 100755
--- a/auth/src/main/res/values-ja/strings.xml
+++ b/auth/src/main/res/values-ja/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">GitHub でログイン</string>
     <string name="fui_sign_in_with_email">メールアドレスでログイン</string>
     <string name="fui_sign_in_with_phone">電話番号でログイン</string>
+    <string name="fui_sign_in_anonymously">ゲストとして続行</string>
     <string name="fui_next_default">次へ</string>
     <string name="fui_email_hint">メールアドレス</string>
     <string name="fui_phone_hint">電話番号</string>
diff --git a/auth/src/main/res/values-kn/strings.xml b/auth/src/main/res/values-kn/strings.xml
index 34f906db0..e42171595 100755
--- a/auth/src/main/res/values-kn/strings.xml
+++ b/auth/src/main/res/values-kn/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">GitHub ಮೂಲಕ ಸೈನ್‌ ಇನ್‌ ಮಾಡಿ</string>
     <string name="fui_sign_in_with_email">ಇಮೇಲ್ ಜೊತೆ ಸೈನ್ ಇನ್ ಮಾಡಿ</string>
     <string name="fui_sign_in_with_phone">ಫೋನ್‌ ಮೂಲಕ ಸೈನ್‌ ಇನ್‌ ಮಾಡಿ</string>
+    <string name="fui_sign_in_anonymously">ಅತಿಥಿಯಂತೆ ಮುಂದುವರಿಸಿ</string>
     <string name="fui_next_default">ಮುಂದೆ</string>
     <string name="fui_email_hint">ಇಮೇಲ್</string>
     <string name="fui_phone_hint">ಫೋನ್ ಸಂಖ್ಯೆ</string>
diff --git a/auth/src/main/res/values-ko/strings.xml b/auth/src/main/res/values-ko/strings.xml
index 7527fcc3e..cfd6b6db2 100755
--- a/auth/src/main/res/values-ko/strings.xml
+++ b/auth/src/main/res/values-ko/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">GitHub로 로그인</string>
     <string name="fui_sign_in_with_email">이메일로 로그인</string>
     <string name="fui_sign_in_with_phone">전화로 로그인</string>
+    <string name="fui_sign_in_anonymously">비회원으로 진행</string>
     <string name="fui_next_default">다음</string>
     <string name="fui_email_hint">이메일</string>
     <string name="fui_phone_hint">전화번호</string>
diff --git a/auth/src/main/res/values-ln/strings.xml b/auth/src/main/res/values-ln/strings.xml
index 747acacae..308e54891 100755
--- a/auth/src/main/res/values-ln/strings.xml
+++ b/auth/src/main/res/values-ln/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Se connecter avec GitHub</string>
     <string name="fui_sign_in_with_email">Se connecter avec une adresse e-mail</string>
     <string name="fui_sign_in_with_phone">Se connecter avec un téléphone</string>
+    <string name="fui_sign_in_anonymously">Continuer en tant qu\'invité</string>
     <string name="fui_next_default">Suivant</string>
     <string name="fui_email_hint">E-mail</string>
     <string name="fui_phone_hint">Numéro de téléphone</string>
diff --git a/auth/src/main/res/values-lt/strings.xml b/auth/src/main/res/values-lt/strings.xml
index 8f48c0f64..088b83c40 100755
--- a/auth/src/main/res/values-lt/strings.xml
+++ b/auth/src/main/res/values-lt/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Prisijungti per „GitHub“</string>
     <string name="fui_sign_in_with_email">Prisijungti nurodant el. pašto adresą</string>
     <string name="fui_sign_in_with_phone">Prisijungti nurodant telefono numerį</string>
+    <string name="fui_sign_in_anonymously">Tęsti kaip svečiui</string>
     <string name="fui_next_default">Kitas</string>
     <string name="fui_email_hint">El. pašto adresas</string>
     <string name="fui_phone_hint">Telefono numeris</string>
diff --git a/auth/src/main/res/values-lv/strings.xml b/auth/src/main/res/values-lv/strings.xml
index 0c658d719..066534909 100755
--- a/auth/src/main/res/values-lv/strings.xml
+++ b/auth/src/main/res/values-lv/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Pierakstīties, izmantojot GitHub</string>
     <string name="fui_sign_in_with_email">Pierakstīties ar e-pasta adresi</string>
     <string name="fui_sign_in_with_phone">Pierakstīties ar tālruni</string>
+    <string name="fui_sign_in_anonymously">Turpināt kā viesim</string>
     <string name="fui_next_default">Tālāk</string>
     <string name="fui_email_hint">E-pasts</string>
     <string name="fui_phone_hint">Tālruņa numurs</string>
diff --git a/auth/src/main/res/values-mo/strings.xml b/auth/src/main/res/values-mo/strings.xml
index 6e8374a04..596926c1b 100755
--- a/auth/src/main/res/values-mo/strings.xml
+++ b/auth/src/main/res/values-mo/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Conectați-vă cu GitHub</string>
     <string name="fui_sign_in_with_email">Conectați-vă cu adresa de e-mail</string>
     <string name="fui_sign_in_with_phone">Conectați-vă cu numărul de telefon</string>
+    <string name="fui_sign_in_anonymously">Continuați ca invitat</string>
     <string name="fui_next_default">Înainte</string>
     <string name="fui_email_hint">Adresă de e-mail</string>
     <string name="fui_phone_hint">Număr de telefon</string>
diff --git a/auth/src/main/res/values-mr/strings.xml b/auth/src/main/res/values-mr/strings.xml
index 90123720c..5566777c1 100755
--- a/auth/src/main/res/values-mr/strings.xml
+++ b/auth/src/main/res/values-mr/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">GitHub सह साइन इन करा</string>
     <string name="fui_sign_in_with_email">ईमेलने साइन इन करा</string>
     <string name="fui_sign_in_with_phone">फोनने साइन इन करा</string>
+    <string name="fui_sign_in_anonymously">अतिथी म्हणून सुरू ठेवा</string>
     <string name="fui_next_default">पुढील</string>
     <string name="fui_email_hint">ईमेल</string>
     <string name="fui_phone_hint">फोन नंबर</string>
diff --git a/auth/src/main/res/values-ms/strings.xml b/auth/src/main/res/values-ms/strings.xml
index da2e1332e..855175cff 100755
--- a/auth/src/main/res/values-ms/strings.xml
+++ b/auth/src/main/res/values-ms/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Log masuk dengan GitHub</string>
     <string name="fui_sign_in_with_email">Log masuk dengan e-mel</string>
     <string name="fui_sign_in_with_phone">Log masuk dengan telefon</string>
+    <string name="fui_sign_in_anonymously">Teruskan sebagai tetamu</string>
     <string name="fui_next_default">Seterusnya</string>
     <string name="fui_email_hint">E-mel</string>
     <string name="fui_phone_hint">Nombor Telefon</string>
diff --git a/auth/src/main/res/values-nb/strings.xml b/auth/src/main/res/values-nb/strings.xml
index 6dd286adc..0d43e8305 100755
--- a/auth/src/main/res/values-nb/strings.xml
+++ b/auth/src/main/res/values-nb/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Logg på med GitHub</string>
     <string name="fui_sign_in_with_email">Logg på med e-postadresse</string>
     <string name="fui_sign_in_with_phone">Logg på med telefonnummeret ditt</string>
+    <string name="fui_sign_in_anonymously">Fortsett som gjest</string>
     <string name="fui_next_default">Neste</string>
     <string name="fui_email_hint">E-post</string>
     <string name="fui_phone_hint">Telefonnummer</string>
diff --git a/auth/src/main/res/values-nl/strings.xml b/auth/src/main/res/values-nl/strings.xml
index cd399d306..6692ffd33 100755
--- a/auth/src/main/res/values-nl/strings.xml
+++ b/auth/src/main/res/values-nl/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Inloggen met GitHub</string>
     <string name="fui_sign_in_with_email">Inloggen met e-mailadres</string>
     <string name="fui_sign_in_with_phone">Inloggen met telefoon</string>
+    <string name="fui_sign_in_anonymously">Doorgaan als gast</string>
     <string name="fui_next_default">Volgende</string>
     <string name="fui_email_hint">E-mail</string>
     <string name="fui_phone_hint">Telefoonnummer</string>
diff --git a/auth/src/main/res/values-no/strings.xml b/auth/src/main/res/values-no/strings.xml
index 6dd286adc..0d43e8305 100755
--- a/auth/src/main/res/values-no/strings.xml
+++ b/auth/src/main/res/values-no/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Logg på med GitHub</string>
     <string name="fui_sign_in_with_email">Logg på med e-postadresse</string>
     <string name="fui_sign_in_with_phone">Logg på med telefonnummeret ditt</string>
+    <string name="fui_sign_in_anonymously">Fortsett som gjest</string>
     <string name="fui_next_default">Neste</string>
     <string name="fui_email_hint">E-post</string>
     <string name="fui_phone_hint">Telefonnummer</string>
diff --git a/auth/src/main/res/values-pl/strings.xml b/auth/src/main/res/values-pl/strings.xml
index 42b242242..7c4b4f24b 100755
--- a/auth/src/main/res/values-pl/strings.xml
+++ b/auth/src/main/res/values-pl/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Zaloguj się przez GitHuba</string>
     <string name="fui_sign_in_with_email">Zaloguj się za pomocą e-maila</string>
     <string name="fui_sign_in_with_phone">Zaloguj się z użyciem numeru telefonu</string>
+    <string name="fui_sign_in_anonymously">Kontynuuj jako gość</string>
     <string name="fui_next_default">Dalej</string>
     <string name="fui_email_hint">Adres e-mail</string>
     <string name="fui_phone_hint">Numer telefonu</string>
diff --git a/auth/src/main/res/values-pt-rBR/strings.xml b/auth/src/main/res/values-pt-rBR/strings.xml
index bdc357c16..9d04780c7 100755
--- a/auth/src/main/res/values-pt-rBR/strings.xml
+++ b/auth/src/main/res/values-pt-rBR/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Fazer login com o GitHub</string>
     <string name="fui_sign_in_with_email">Fazer login com o e-mail</string>
     <string name="fui_sign_in_with_phone">Fazer login com o telefone</string>
+    <string name="fui_sign_in_anonymously">Continuar como convidado</string>
     <string name="fui_next_default">Próxima</string>
     <string name="fui_email_hint">E-mail</string>
     <string name="fui_phone_hint">Número de telefone</string>
diff --git a/auth/src/main/res/values-pt-rPT/strings.xml b/auth/src/main/res/values-pt-rPT/strings.xml
index 25ac63248..209f3dbd9 100755
--- a/auth/src/main/res/values-pt-rPT/strings.xml
+++ b/auth/src/main/res/values-pt-rPT/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Iniciar sessão com o GitHub</string>
     <string name="fui_sign_in_with_email">Iniciar sessão com o email</string>
     <string name="fui_sign_in_with_phone">Iniciar sessão com o telemóvel</string>
+    <string name="fui_sign_in_anonymously">Continuar como convidado</string>
     <string name="fui_next_default">Seguinte</string>
     <string name="fui_email_hint">Email</string>
     <string name="fui_phone_hint">Número de telefone</string>
diff --git a/auth/src/main/res/values-pt/strings.xml b/auth/src/main/res/values-pt/strings.xml
index bdc357c16..9d04780c7 100755
--- a/auth/src/main/res/values-pt/strings.xml
+++ b/auth/src/main/res/values-pt/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Fazer login com o GitHub</string>
     <string name="fui_sign_in_with_email">Fazer login com o e-mail</string>
     <string name="fui_sign_in_with_phone">Fazer login com o telefone</string>
+    <string name="fui_sign_in_anonymously">Continuar como convidado</string>
     <string name="fui_next_default">Próxima</string>
     <string name="fui_email_hint">E-mail</string>
     <string name="fui_phone_hint">Número de telefone</string>
diff --git a/auth/src/main/res/values-ro/strings.xml b/auth/src/main/res/values-ro/strings.xml
index 6e8374a04..596926c1b 100755
--- a/auth/src/main/res/values-ro/strings.xml
+++ b/auth/src/main/res/values-ro/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Conectați-vă cu GitHub</string>
     <string name="fui_sign_in_with_email">Conectați-vă cu adresa de e-mail</string>
     <string name="fui_sign_in_with_phone">Conectați-vă cu numărul de telefon</string>
+    <string name="fui_sign_in_anonymously">Continuați ca invitat</string>
     <string name="fui_next_default">Înainte</string>
     <string name="fui_email_hint">Adresă de e-mail</string>
     <string name="fui_phone_hint">Număr de telefon</string>
diff --git a/auth/src/main/res/values-ru/strings.xml b/auth/src/main/res/values-ru/strings.xml
index b814d2500..4b26ca0c7 100755
--- a/auth/src/main/res/values-ru/strings.xml
+++ b/auth/src/main/res/values-ru/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Войти через аккаунт GitHub</string>
     <string name="fui_sign_in_with_email">Войти по адресу электронной почты</string>
     <string name="fui_sign_in_with_phone">Войти по номеру телефона</string>
+    <string name="fui_sign_in_anonymously">Продолжить как гость</string>
     <string name="fui_next_default">Далее</string>
     <string name="fui_email_hint">Адрес электронной почты</string>
     <string name="fui_phone_hint">Номер телефона</string>
diff --git a/auth/src/main/res/values-sk/strings.xml b/auth/src/main/res/values-sk/strings.xml
index 51426de9f..0991a5c4d 100755
--- a/auth/src/main/res/values-sk/strings.xml
+++ b/auth/src/main/res/values-sk/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Prihlásiť sa cez GitHub</string>
     <string name="fui_sign_in_with_email">Prihlásiť sa e-mailom</string>
     <string name="fui_sign_in_with_phone">Prihlásiť sa telefónom</string>
+    <string name="fui_sign_in_anonymously">Pokračovať ako hosť</string>
     <string name="fui_next_default">Ďalej</string>
     <string name="fui_email_hint">E-mail</string>
     <string name="fui_phone_hint">Telefónne číslo</string>
diff --git a/auth/src/main/res/values-sl/strings.xml b/auth/src/main/res/values-sl/strings.xml
index b1bfeef2b..20fe6af8a 100755
--- a/auth/src/main/res/values-sl/strings.xml
+++ b/auth/src/main/res/values-sl/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Prijava z računom za GitHub</string>
     <string name="fui_sign_in_with_email">Prijava z e-poštnim naslovom</string>
     <string name="fui_sign_in_with_phone">Prijava s telefonom</string>
+    <string name="fui_sign_in_anonymously">Nadaljuj kot gost</string>
     <string name="fui_next_default">Naprej</string>
     <string name="fui_email_hint">E-pošta</string>
     <string name="fui_phone_hint">Telefonska številka</string>
diff --git a/auth/src/main/res/values-sr/strings.xml b/auth/src/main/res/values-sr/strings.xml
index e62189d57..b54e6fa08 100755
--- a/auth/src/main/res/values-sr/strings.xml
+++ b/auth/src/main/res/values-sr/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Пријавите се помоћу GitHub-а</string>
     <string name="fui_sign_in_with_email">Пријави ме помоћу имејла</string>
     <string name="fui_sign_in_with_phone">Пријави ме помоћу телефона</string>
+    <string name="fui_sign_in_anonymously">Наставите као гост</string>
     <string name="fui_next_default">Даље</string>
     <string name="fui_email_hint">Имејл</string>
     <string name="fui_phone_hint">Број телефона</string>
diff --git a/auth/src/main/res/values-sv/strings.xml b/auth/src/main/res/values-sv/strings.xml
index bd2c81a37..c9459eb25 100755
--- a/auth/src/main/res/values-sv/strings.xml
+++ b/auth/src/main/res/values-sv/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Logga in med GitHub</string>
     <string name="fui_sign_in_with_email">Logga in med e-post</string>
     <string name="fui_sign_in_with_phone">Logga in med telefon</string>
+    <string name="fui_sign_in_anonymously">Fortsätt som gäst</string>
     <string name="fui_next_default">Nästa</string>
     <string name="fui_email_hint">E-post</string>
     <string name="fui_phone_hint">Telefonnummer</string>
diff --git a/auth/src/main/res/values-ta/strings.xml b/auth/src/main/res/values-ta/strings.xml
index 0dfd772a0..6f573dd33 100755
--- a/auth/src/main/res/values-ta/strings.xml
+++ b/auth/src/main/res/values-ta/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">GitHub பயன்படுத்தி உள்நுழைக</string>
     <string name="fui_sign_in_with_email">மின்னஞ்சல் மூலம் உள்நுழைக</string>
     <string name="fui_sign_in_with_phone">ஃபோன் எண் மூலம் உள்நுழைக</string>
+    <string name="fui_sign_in_anonymously">விருந்தினராகத் தொடர்க</string>
     <string name="fui_next_default">அடுத்து</string>
     <string name="fui_email_hint">மின்னஞ்சல்</string>
     <string name="fui_phone_hint">ஃபோன் எண்</string>
diff --git a/auth/src/main/res/values-th/strings.xml b/auth/src/main/res/values-th/strings.xml
index f5fde37b3..27d6d7cbc 100755
--- a/auth/src/main/res/values-th/strings.xml
+++ b/auth/src/main/res/values-th/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">ลงชื่อเข้าใช้ด้วย GitHub</string>
     <string name="fui_sign_in_with_email">ลงชื่อเข้าใช้ด้วยอีเมล</string>
     <string name="fui_sign_in_with_phone">ลงชื่อเข้าใช้ด้วยโทรศัพท์</string>
+    <string name="fui_sign_in_anonymously">ดำเนินการต่อในฐานะผู้เข้าร่วม</string>
     <string name="fui_next_default">ถัดไป</string>
     <string name="fui_email_hint">อีเมล</string>
     <string name="fui_phone_hint">หมายเลขโทรศัพท์</string>
diff --git a/auth/src/main/res/values-tl/strings.xml b/auth/src/main/res/values-tl/strings.xml
index e9a8de2de..c6cf6f60b 100755
--- a/auth/src/main/res/values-tl/strings.xml
+++ b/auth/src/main/res/values-tl/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Mag-sign in sa GitHub</string>
     <string name="fui_sign_in_with_email">Mag-sign in gamit ang email</string>
     <string name="fui_sign_in_with_phone">Mag-sign in gamit ang telepono</string>
+    <string name="fui_sign_in_anonymously">Magpatuloy bilang bisita</string>
     <string name="fui_next_default">Susunod</string>
     <string name="fui_email_hint">Mag-email</string>
     <string name="fui_phone_hint">Numero ng Telepono</string>
diff --git a/auth/src/main/res/values-tr/strings.xml b/auth/src/main/res/values-tr/strings.xml
index a2e39b28a..c0dc8032f 100755
--- a/auth/src/main/res/values-tr/strings.xml
+++ b/auth/src/main/res/values-tr/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">GitHub ile oturum aç</string>
     <string name="fui_sign_in_with_email">E-posta ile oturum aç</string>
     <string name="fui_sign_in_with_phone">Telefonla oturum aç</string>
+    <string name="fui_sign_in_anonymously">Misafir olarak devam et</string>
     <string name="fui_next_default">İleri</string>
     <string name="fui_email_hint">E-posta</string>
     <string name="fui_phone_hint">Telefon Numarası</string>
diff --git a/auth/src/main/res/values-uk/strings.xml b/auth/src/main/res/values-uk/strings.xml
index 8fe0677c9..1f1fafa58 100755
--- a/auth/src/main/res/values-uk/strings.xml
+++ b/auth/src/main/res/values-uk/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Увійти через GitHub</string>
     <string name="fui_sign_in_with_email">Увійти, використовуючи електронну адресу</string>
     <string name="fui_sign_in_with_phone">Увійти, використовуючи телефон</string>
+    <string name="fui_sign_in_anonymously">Продовжити як гість</string>
     <string name="fui_next_default">Далі</string>
     <string name="fui_email_hint">Електронна адреса</string>
     <string name="fui_phone_hint">Номер телефону</string>
diff --git a/auth/src/main/res/values-ur/strings.xml b/auth/src/main/res/values-ur/strings.xml
index f523cd7b5..2c37ba3f0 100755
--- a/auth/src/main/res/values-ur/strings.xml
+++ b/auth/src/main/res/values-ur/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">GitHub کے ساتھ سائن ان کریں</string>
     <string name="fui_sign_in_with_email">ای میل کے ساتھ سائن ان کریں</string>
     <string name="fui_sign_in_with_phone">فون کے ساتھ سائں ان کریں</string>
+    <string name="fui_sign_in_anonymously">مہمان کے طور پر جاری رکھیں</string>
     <string name="fui_next_default">اگلا</string>
     <string name="fui_email_hint">ای میل</string>
     <string name="fui_phone_hint">فون نمبر</string>
diff --git a/auth/src/main/res/values-vi/strings.xml b/auth/src/main/res/values-vi/strings.xml
index 183511979..5ab30f268 100755
--- a/auth/src/main/res/values-vi/strings.xml
+++ b/auth/src/main/res/values-vi/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">Đăng nhập bằng GitHub</string>
     <string name="fui_sign_in_with_email">Đăng nhập bằng email</string>
     <string name="fui_sign_in_with_phone">Đăng nhập bằng điện thoại</string>
+    <string name="fui_sign_in_anonymously">Tiếp tục với vai trò người dùng khách</string>
     <string name="fui_next_default">Tiếp</string>
     <string name="fui_email_hint">Email</string>
     <string name="fui_phone_hint">Số điện thoại</string>
diff --git a/auth/src/main/res/values-zh-rCN/strings.xml b/auth/src/main/res/values-zh-rCN/strings.xml
index cbe41e263..9c445ea60 100755
--- a/auth/src/main/res/values-zh-rCN/strings.xml
+++ b/auth/src/main/res/values-zh-rCN/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">使用 GitHub 帐号登录</string>
     <string name="fui_sign_in_with_email">使用电子邮件地址登录</string>
     <string name="fui_sign_in_with_phone">使用电话号码登录</string>
+    <string name="fui_sign_in_anonymously">以访客身份继续</string>
     <string name="fui_next_default">继续</string>
     <string name="fui_email_hint">电子邮件地址</string>
     <string name="fui_phone_hint">电话号码</string>
diff --git a/auth/src/main/res/values-zh-rHK/strings.xml b/auth/src/main/res/values-zh-rHK/strings.xml
index bccfccc5a..b799ce228 100755
--- a/auth/src/main/res/values-zh-rHK/strings.xml
+++ b/auth/src/main/res/values-zh-rHK/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">使用 GitHub 登入</string>
     <string name="fui_sign_in_with_email">使用電子郵件地址登入</string>
     <string name="fui_sign_in_with_phone">使用電話號碼登入</string>
+    <string name="fui_sign_in_anonymously">繼續以訪客身分使用</string>
     <string name="fui_next_default">繼續</string>
     <string name="fui_email_hint">電子郵件</string>
     <string name="fui_phone_hint">電話號碼</string>
diff --git a/auth/src/main/res/values-zh-rTW/strings.xml b/auth/src/main/res/values-zh-rTW/strings.xml
index bccfccc5a..b799ce228 100755
--- a/auth/src/main/res/values-zh-rTW/strings.xml
+++ b/auth/src/main/res/values-zh-rTW/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">使用 GitHub 登入</string>
     <string name="fui_sign_in_with_email">使用電子郵件地址登入</string>
     <string name="fui_sign_in_with_phone">使用電話號碼登入</string>
+    <string name="fui_sign_in_anonymously">繼續以訪客身分使用</string>
     <string name="fui_next_default">繼續</string>
     <string name="fui_email_hint">電子郵件</string>
     <string name="fui_phone_hint">電話號碼</string>
diff --git a/auth/src/main/res/values-zh/strings.xml b/auth/src/main/res/values-zh/strings.xml
index cbe41e263..9c445ea60 100755
--- a/auth/src/main/res/values-zh/strings.xml
+++ b/auth/src/main/res/values-zh/strings.xml
@@ -13,6 +13,7 @@
     <string name="fui_sign_in_with_github">使用 GitHub 帐号登录</string>
     <string name="fui_sign_in_with_email">使用电子邮件地址登录</string>
     <string name="fui_sign_in_with_phone">使用电话号码登录</string>
+    <string name="fui_sign_in_anonymously">以访客身份继续</string>
     <string name="fui_next_default">继续</string>
     <string name="fui_email_hint">电子邮件地址</string>
     <string name="fui_phone_hint">电话号码</string>
diff --git a/docs/internal/translations.md b/docs/internal/translations.md
index 333187094..60cfcc643 100644
--- a/docs/internal/translations.md
+++ b/docs/internal/translations.md
@@ -74,5 +74,5 @@ way to run an equivalent formatter at the command line.
 Third, run the following from your project root:
 
 ```
-/scripts/translations/clean_up_translations.sh
+./scripts/translations/clean_up_translations.sh
 ```

From 71fa34a822b9593e2bf4b59898ee1ad2ba9c65b6 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Wed, 18 Jul 2018 11:41:17 -0700
Subject: [PATCH 25/28] Save phone verification ID across process deaths
 (#1393)

---
 .../firebase/ui/auth/ui/phone/PhoneActivity.java | 16 ++++++++++++----
 .../ui/phone/PhoneNumberVerificationHandler.java | 13 +++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

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 2dccd14ff..431e6e379 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
@@ -46,6 +46,8 @@
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class PhoneActivity extends AppCompatBase {
+    private PhoneNumberVerificationHandler mPhoneVerifier;
+
     public static Intent createIntent(Context context, FlowParameters params, Bundle args) {
         return createBaseIntent(context, PhoneActivity.class, params)
                 .putExtra(ExtraConstants.PARAMS, args);
@@ -72,10 +74,10 @@ protected void onFailure(@NonNull Exception e) {
             }
         });
 
-        final PhoneNumberVerificationHandler phoneVerifier =
-                ViewModelProviders.of(this).get(PhoneNumberVerificationHandler.class);
-        phoneVerifier.init(getFlowParams());
-        phoneVerifier.getOperation().observe(this, new ResourceObserver<PhoneVerification>(
+        mPhoneVerifier = ViewModelProviders.of(this).get(PhoneNumberVerificationHandler.class);
+        mPhoneVerifier.init(getFlowParams());
+        mPhoneVerifier.onRestoreInstanceState(savedInstanceState);
+        mPhoneVerifier.getOperation().observe(this, new ResourceObserver<PhoneVerification>(
                 this, R.string.fui_verifying) {
             @Override
             protected void onSuccess(@NonNull PhoneVerification verification) {
@@ -121,6 +123,12 @@ protected void onFailure(@NonNull Exception e) {
                 .commit();
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mPhoneVerifier.onSaveInstanceState(outState);
+    }
+
     @Override
     public void onBackPressed() {
         if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
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 ee1ffe53b..a00151006 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,7 +1,9 @@
 package com.firebase.ui.auth.ui.phone;
 
 import android.app.Application;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import com.firebase.ui.auth.data.model.PhoneNumberVerificationRequiredException;
 import com.firebase.ui.auth.data.model.Resource;
@@ -15,6 +17,7 @@
 
 public class PhoneNumberVerificationHandler extends AuthViewModelBase<PhoneVerification> {
     private static final long AUTO_RETRIEVAL_TIMEOUT_SECONDS = 120;
+    private static final String VERIFICATION_ID_KEY = "verification_id";
 
     private String mVerificationId;
     private PhoneAuthProvider.ForceResendingToken mForceResendingToken;
@@ -60,4 +63,14 @@ public void submitVerificationCode(String number, String code) {
                 PhoneAuthProvider.getCredential(mVerificationId, code),
                 false)));
     }
+
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        outState.putString(VERIFICATION_ID_KEY, mVerificationId);
+    }
+
+    public void onRestoreInstanceState(@Nullable Bundle savedInstanceState) {
+        if (mVerificationId == null && savedInstanceState != null) {
+            mVerificationId = savedInstanceState.getString(VERIFICATION_ID_KEY);
+        }
+    }
 }

From f8affdf1618a8ef7afd8c04c5c270ae23a36f66b Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Sat, 4 Aug 2018 20:26:43 -0700
Subject: [PATCH 26/28] Revert "Upgrading anonymous accounts  (#1368)"

This reverts commit a97133b

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 app/src/main/AndroidManifest.xml              |   3 -
 .../com/firebase/uidemo/ChooserActivity.java  |   4 -
 .../uidemo/auth/AnonymousUpgradeActivity.java | 197 --------------
 .../firebase/uidemo/auth/AuthUiActivity.java  |  45 +++-
 .../uidemo/util/ConfigurationUtils.java       |  68 -----
 .../res/layout/activity_anonymous_upgrade.xml |  67 -----
 app/src/main/res/values/strings.xml           |   6 -
 auth/README.md                                |  82 ------
 auth/build.gradle.kts                         |   2 -
 .../java/com/firebase/ui/auth/AuthUI.java     |  16 +-
 .../java/com/firebase/ui/auth/ErrorCodes.java |  20 +-
 ...FirebaseAuthAnonymousUpgradeException.java |  21 --
 .../com/firebase/ui/auth/IdpResponse.java     |  43 +--
 .../com/firebase/ui/auth/KickoffActivity.java |   4 -
 .../ui/auth/data/model/FlowParameters.java    |  14 +-
 .../auth/data/remote/EmailSignInHandler.java  |   5 +-
 .../auth/data/remote/SignInKickstarter.java   |   4 -
 .../ui/auth/ui/HelperActivityBase.java        |   4 +-
 .../ui/auth/ui/email/CheckEmailFragment.java  |   4 +-
 .../ui/auth/ui/email/EmailActivity.java       |   9 +-
 .../auth/ui/email/RegisterEmailFragment.java  |  26 +-
 .../ui/email/WelcomeBackPasswordPrompt.java   |   9 +-
 .../auth/ui/idp/AuthMethodPickerActivity.java |  12 +-
 .../ui/auth/ui/idp/WelcomeBackIdpPrompt.java  |  13 +-
 .../ui/auth/ui/phone/PhoneActivity.java       |   7 +-
 .../auth/util/data/AuthOperationManager.java  | 105 --------
 .../ui/auth/util/data/ProviderUtils.java      |  11 -
 .../auth/viewmodel/SignInViewModelBase.java   |  15 --
 .../email/EmailProviderResponseHandler.java   |  38 +--
 .../email/WelcomeBackPasswordHandler.java     | 104 ++------
 .../LinkingSocialProviderResponseHandler.java |  63 ++---
 .../idp/SocialProviderResponseHandler.java    | 129 ++++-----
 .../phone/PhoneProviderResponseHandler.java   |  29 +-
 .../ui/auth/testhelpers/TestHelper.java       |   9 +-
 ...kingSocialProviderResponseHandlerTest.java | 247 ------------------
 .../PhoneProviderResponseHandlerTest.java     | 140 ----------
 .../SocialProviderResponseHandlerTest.java    | 179 +------------
 .../WelcomeBackPasswordHandlerTest.java       | 124 +--------
 buildSrc/src/main/kotlin/Config.kt            |   1 -
 39 files changed, 181 insertions(+), 1698 deletions(-)
 delete mode 100644 app/src/main/java/com/firebase/uidemo/auth/AnonymousUpgradeActivity.java
 delete mode 100644 app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java
 delete mode 100644 app/src/main/res/layout/activity_anonymous_upgrade.xml
 delete mode 100644 auth/src/main/java/com/firebase/ui/auth/FirebaseAuthAnonymousUpgradeException.java
 delete mode 100644 auth/src/main/java/com/firebase/ui/auth/util/data/AuthOperationManager.java
 delete mode 100644 auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
 delete mode 100644 auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0a6d84862..0a381a18c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,9 +37,6 @@
         <activity
             android:name=".auth.SignedInActivity"
             android:label="@string/title_auth_activity" />
-        <activity
-            android:name=".auth.AnonymousUpgradeActivity"
-            android:label="@string/title_anonymous_upgrade"/>
 
         <!-- Firestore demo -->
         <activity
diff --git a/app/src/main/java/com/firebase/uidemo/ChooserActivity.java b/app/src/main/java/com/firebase/uidemo/ChooserActivity.java
index 612fe4ab9..6d039926b 100644
--- a/app/src/main/java/com/firebase/uidemo/ChooserActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/ChooserActivity.java
@@ -26,7 +26,6 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.firebase.uidemo.auth.AnonymousUpgradeActivity;
 import com.firebase.uidemo.auth.AuthUiActivity;
 import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
 import com.firebase.uidemo.database.firestore.FirestorePagingActivity;
@@ -54,7 +53,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     private static class ActivityChooserAdapter extends RecyclerView.Adapter<ActivityStarterHolder> {
         private static final Class[] CLASSES = new Class[]{
                 AuthUiActivity.class,
-                AnonymousUpgradeActivity.class,
                 FirestoreChatActivity.class,
                 FirestorePagingActivity.class,
                 RealtimeDbChatActivity.class,
@@ -63,7 +61,6 @@ private static class ActivityChooserAdapter extends RecyclerView.Adapter<Activit
 
         private static final int[] DESCRIPTION_NAMES = new int[]{
                 R.string.title_auth_activity,
-                R.string.title_anonymous_upgrade,
                 R.string.title_firestore_activity,
                 R.string.title_firestore_paging_activity,
                 R.string.title_realtime_database_activity,
@@ -72,7 +69,6 @@ private static class ActivityChooserAdapter extends RecyclerView.Adapter<Activit
 
         private static final int[] DESCRIPTION_IDS = new int[]{
                 R.string.desc_auth,
-                R.string.desc_anonymous_upgrade,
                 R.string.desc_firestore,
                 R.string.desc_firestore_paging,
                 R.string.desc_realtime_database,
diff --git a/app/src/main/java/com/firebase/uidemo/auth/AnonymousUpgradeActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AnonymousUpgradeActivity.java
deleted file mode 100644
index f2cbf870c..000000000
--- a/app/src/main/java/com/firebase/uidemo/auth/AnonymousUpgradeActivity.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.firebase.uidemo.auth;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.text.TextUtils;
-import android.util.Log;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.firebase.ui.auth.AuthUI;
-import com.firebase.ui.auth.ErrorCodes;
-import com.firebase.ui.auth.IdpResponse;
-import com.firebase.uidemo.R;
-import com.firebase.uidemo.util.ConfigurationUtils;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
-import com.google.firebase.auth.AuthCredential;
-import com.google.firebase.auth.AuthResult;
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseUser;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-public class AnonymousUpgradeActivity extends AppCompatActivity {
-
-    private static final String TAG = "AccountLink";
-
-    private static final int RC_SIGN_IN = 123;
-
-    @BindView(R.id.status_text)
-    TextView mStatus;
-
-    @BindView(R.id.anon_sign_in)
-    Button mAnonSignInButton;
-
-    @BindView(R.id.begin_flow)
-    Button mLaunchUIButton;
-
-    @BindView(R.id.resolve_merge)
-    Button mResolveMergeButton;
-
-    @BindView(R.id.sign_out)
-    Button mSignOutButton;
-
-    private AuthCredential mPendingCredential;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_anonymous_upgrade);
-        ButterKnife.bind(this);
-    }
-
-    @OnClick(R.id.anon_sign_in)
-    public void signInAnonymously() {
-        FirebaseAuth.getInstance().signInAnonymously()
-                .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
-                    @Override
-                    public void onComplete(@NonNull Task<AuthResult> task) {
-                        updateUI();
-
-                        if (task.isSuccessful()) {
-                            setStatus("Signed in anonymously as user "
-                                    + getUserIdentifier(task.getResult().getUser()));
-                        } else {
-                            setStatus("Anonymous sign in failed.");
-                        }
-                    }
-                });
-    }
-
-    @OnClick(R.id.begin_flow)
-    public void startAuthUI() {
-        List<AuthUI.IdpConfig> providers = ConfigurationUtils.getConfiguredProviders(this);
-        Intent intent = AuthUI.getInstance().createSignInIntentBuilder()
-            .setLogo(R.drawable.firebase_auth_120dp)
-            .setAvailableProviders(providers)
-            .setIsSmartLockEnabled(false)
-            .enableAnonymousUsersAutoUpgrade()
-            .build();
-        startActivityForResult(intent, RC_SIGN_IN);
-    }
-
-    @OnClick(R.id.resolve_merge)
-    public void resolveMerge() {
-        if (mPendingCredential == null) {
-            Toast.makeText(this, "Nothing to resolve.", Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        // TODO: Show how to do good data moving
-
-        FirebaseAuth.getInstance().signInWithCredential(mPendingCredential)
-                .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
-                    @Override
-                    public void onComplete(@NonNull Task<AuthResult> task) {
-                        mPendingCredential = null;
-                        updateUI();
-
-                        if (task.isSuccessful()) {
-                            setStatus("Signed in as " + getUserIdentifier(task.getResult().getUser()));
-                        } else {
-                            Log.w(TAG, "Merge failed", task.getException());
-                            setStatus("Failed to resolve merge conflict, see logs.");
-                        }
-                    }
-                });
-    }
-
-    @OnClick(R.id.sign_out)
-    public void signOut() {
-        AuthUI.getInstance().signOut(this)
-                .addOnCompleteListener(new OnCompleteListener<Void>() {
-                    @Override
-                    public void onComplete(@NonNull Task<Void> task) {
-                        setStatus(null);
-                        updateUI();
-                    }
-                });
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == RC_SIGN_IN) {
-            IdpResponse response = IdpResponse.fromResultIntent(data);
-            if (response == null) {
-                // User pressed back button
-                return;
-            }
-            if (resultCode == RESULT_OK) {
-                setStatus("Signed in as " + getUserIdentifier(FirebaseAuth.getInstance().getCurrentUser()));
-            } else {
-                if (response.getError().getErrorCode() == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
-                    setStatus("Merge conflict: user already exists.");
-                    mResolveMergeButton.setEnabled(true);
-                    mPendingCredential = response.getCredentialForLinking();
-                }
-            }
-
-            updateUI();
-        }
-    }
-
-    private void updateUI() {
-        FirebaseUser currentUser = FirebaseAuth.getInstance().getCurrentUser();
-
-        if (currentUser == null) {
-            // Not signed in
-            mAnonSignInButton.setEnabled(true);
-            mLaunchUIButton.setEnabled(false);
-            mResolveMergeButton.setEnabled(false);
-            mSignOutButton.setEnabled(false);
-        } else if (mPendingCredential == null && currentUser.isAnonymous()) {
-            // Anonymous user, waiting for linking
-            mAnonSignInButton.setEnabled(false);
-            mLaunchUIButton.setEnabled(true);
-            mResolveMergeButton.setEnabled(false);
-            mSignOutButton.setEnabled(true);
-        } else if (mPendingCredential == null && !currentUser.isAnonymous()) {
-            // Fully signed in
-            mAnonSignInButton.setEnabled(false);
-            mLaunchUIButton.setEnabled(false);
-            mResolveMergeButton.setEnabled(false);
-            mSignOutButton.setEnabled(true);
-        } else if (mPendingCredential != null) {
-            // Signed in anonymous, awaiting merge conflict
-            mAnonSignInButton.setEnabled(false);
-            mLaunchUIButton.setEnabled(false);
-            mResolveMergeButton.setEnabled(true);
-            mSignOutButton.setEnabled(true);
-        }
-    }
-
-    private void setStatus(String message) {
-        mStatus.setText(message);
-    }
-
-    private String getUserIdentifier(FirebaseUser user) {
-        if (user.isAnonymous()) {
-            return user.getUid();
-        } else if (!TextUtils.isEmpty(user.getEmail())) {
-            return user.getEmail();
-        } else if (!TextUtils.isEmpty(user.getPhoneNumber())) {
-            return user.getPhoneNumber();
-        } else {
-            return "unknown";
-        }
-    }
-}
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 ca68daab9..2af212827 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -38,7 +38,6 @@
 import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.uidemo.R;
-import com.firebase.uidemo.util.ConfigurationUtils;
 import com.google.android.gms.common.Scopes;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
@@ -46,6 +45,7 @@
 import com.google.firebase.auth.FirebaseAuth;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import butterknife.BindView;
@@ -114,7 +114,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.auth_ui_layout);
         ButterKnife.bind(this);
 
-        if (ConfigurationUtils.isGoogleMisconfigured(this)) {
+        if (isGoogleMisconfigured()) {
             mUseGoogleProvider.setChecked(false);
             mUseGoogleProvider.setEnabled(false);
             mUseGoogleProvider.setText(R.string.google_label_missing_config);
@@ -129,7 +129,7 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
             });
         }
 
-        if (ConfigurationUtils.isFacebookMisconfigured(this)) {
+        if (isFacebookMisconfigured()) {
             mUseFacebookProvider.setChecked(false);
             mUseFacebookProvider.setEnabled(false);
             mUseFacebookProvider.setText(R.string.facebook_label_missing_config);
@@ -144,13 +144,13 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
             });
         }
 
-        if (ConfigurationUtils.isTwitterMisconfigured(this)) {
+        if (isTwitterMisconfigured()) {
             mUseTwitterProvider.setChecked(false);
             mUseTwitterProvider.setEnabled(false);
             mUseTwitterProvider.setText(R.string.twitter_label_missing_config);
         }
 
-        if (ConfigurationUtils.isGitHubMisconfigured(this)) {
+        if (isGitHubMisconfigured()) {
             mUseGitHubProvider.setChecked(false);
             mUseGitHubProvider.setEnabled(false);
             mUseGitHubProvider.setText(R.string.github_label_missing_config);
@@ -165,10 +165,8 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
             });
         }
 
-        if (ConfigurationUtils.isGoogleMisconfigured(this)
-                || ConfigurationUtils.isFacebookMisconfigured(this)
-                || ConfigurationUtils.isTwitterMisconfigured(this)
-                || ConfigurationUtils.isGitHubMisconfigured(this)) {
+        if (isGoogleMisconfigured() || isFacebookMisconfigured()
+                || isTwitterMisconfigured() || isGitHubMisconfigured()) {
             showSnackbar(R.string.configuration_required);
         }
 
@@ -226,7 +224,7 @@ protected void onResume() {
     }
 
     private void handleSignInResponse(int resultCode, Intent data) {
-        final IdpResponse response = IdpResponse.fromResultIntent(data);
+        IdpResponse response = IdpResponse.fromResultIntent(data);
 
         // Successfully signed in
         if (resultCode == RESULT_OK) {
@@ -343,6 +341,33 @@ private String getSelectedPrivacyPolicyUrl() {
         return FIREBASE_PRIVACY_POLICY_URL;
     }
 
+    private boolean isGoogleMisconfigured() {
+        return AuthUI.UNCONFIGURED_CONFIG_VALUE.equals(getString(R.string.default_web_client_id));
+    }
+
+    private boolean isFacebookMisconfigured() {
+        return AuthUI.UNCONFIGURED_CONFIG_VALUE.equals(getString(R.string.facebook_application_id));
+    }
+
+    private boolean isTwitterMisconfigured() {
+        List<String> twitterConfigs = Arrays.asList(
+                getString(R.string.twitter_consumer_key),
+                getString(R.string.twitter_consumer_secret)
+        );
+
+        return twitterConfigs.contains(AuthUI.UNCONFIGURED_CONFIG_VALUE);
+    }
+
+    private boolean isGitHubMisconfigured() {
+        List<String> gitHubConfigs = Arrays.asList(
+                getString(R.string.firebase_web_host),
+                getString(R.string.github_client_id),
+                getString(R.string.github_client_secret)
+        );
+
+        return gitHubConfigs.contains(AuthUI.UNCONFIGURED_CONFIG_VALUE);
+    }
+
     private void setGoogleScopesEnabled(boolean enabled) {
         mGoogleScopesHeader.setEnabled(enabled);
         mGoogleScopeDriveFile.setEnabled(enabled);
diff --git a/app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java b/app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java
deleted file mode 100644
index 18f3f7d0b..000000000
--- a/app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.firebase.uidemo.util;
-
-
-import android.content.Context;
-import android.content.res.Resources;
-
-import com.firebase.ui.auth.AuthUI;
-import com.firebase.uidemo.R;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class ConfigurationUtils {
-
-    public static boolean isGoogleMisconfigured(Context context) {
-        return AuthUI.UNCONFIGURED_CONFIG_VALUE.equals(
-                context.getString(R.string.default_web_client_id));
-    }
-
-    public static boolean isFacebookMisconfigured(Context context) {
-        return AuthUI.UNCONFIGURED_CONFIG_VALUE.equals(
-                context.getString(R.string.facebook_application_id));
-    }
-
-    public static boolean isTwitterMisconfigured(Context context) {
-        List<String> twitterConfigs = Arrays.asList(
-                context.getString(R.string.twitter_consumer_key),
-                context.getString(R.string.twitter_consumer_secret)
-        );
-
-        return twitterConfigs.contains(AuthUI.UNCONFIGURED_CONFIG_VALUE);
-    }
-
-    public static boolean isGitHubMisconfigured(Context context) {
-        List<String> gitHubConfigs = Arrays.asList(
-                context.getString(R.string.firebase_web_host),
-                context.getString(R.string.github_client_id),
-                context.getString(R.string.github_client_secret)
-        );
-
-        return gitHubConfigs.contains(AuthUI.UNCONFIGURED_CONFIG_VALUE);
-    }
-
-    public static List<AuthUI.IdpConfig> getConfiguredProviders(Context context) {
-        List<AuthUI.IdpConfig> providers = new ArrayList<>();
-        providers.add(new AuthUI.IdpConfig.EmailBuilder().build());
-        providers.add(new AuthUI.IdpConfig.PhoneBuilder().build());
-
-        if (!isGoogleMisconfigured(context)) {
-            providers.add(new AuthUI.IdpConfig.GoogleBuilder().build());
-        }
-
-        if (!isFacebookMisconfigured(context)) {
-            providers.add(new AuthUI.IdpConfig.FacebookBuilder().build());
-        }
-
-        if (!isTwitterMisconfigured(context)) {
-            providers.add(new AuthUI.IdpConfig.TwitterBuilder().build());
-        }
-
-        if (!isGitHubMisconfigured(context)) {
-            providers.add(new AuthUI.IdpConfig.GitHubBuilder().build());
-        }
-
-        return providers;
-    }
-}
diff --git a/app/src/main/res/layout/activity_anonymous_upgrade.xml b/app/src/main/res/layout/activity_anonymous_upgrade.xml
deleted file mode 100644
index 6ac9537e0..000000000
--- a/app/src/main/res/layout/activity_anonymous_upgrade.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginLeft="24dp"
-    android:layout_marginRight="24dp"
-    android:layout_marginTop="16dp"
-    android:layout_marginBottom="16dp"
-    android:orientation="vertical"
-    tools:context=".auth.AuthUiActivity">
-
-    <TextView
-        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" />
-
-    <TextView
-        android:id="@+id/status_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:gravity="center"
-        android:textIsSelectable="true"
-        tools:text="This is the status view, sometimes it will have a very long status and other..." />
-
-    <Button
-        android:id="@+id/anon_sign_in"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/anonymous_sign_in" />
-
-    <Button
-        android:id="@+id/begin_flow"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/launch_auth_ui"
-        android:enabled="false" />
-
-    <Button
-        android:id="@+id/resolve_merge"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/resolve_merge_conflict"
-        android:enabled="false" />
-
-    <Button
-        android:id="@+id/sign_out"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/sign_out"
-        android:enabled="false" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c500e7614..58cc521ea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,6 @@
     <string name="title_storage_activity">Storage Image Demo</string>
 
     <string name="desc_auth">Demonstrates the Firebase Auth UI flow, with customization options.</string>
-    <string name="desc_anonymous_upgrade">Demonstrates upgrading an anonymous account using FirebaseUI.</string>
     <string name="desc_firestore">Demonstrates using a FirestoreRecyclerAdapter to load data from Cloud Firestore into a RecyclerView for a basic chat app.</string>
     <string name="desc_firestore_paging">Demonstrates using a FirestorePagingAdapter to load/infinite scroll paged data from Cloud Firestore.</string>
     <string name="desc_realtime_database">Demonstrates using a FirebaseRecyclerAdapter to load data from Firebase Database into a RecyclerView for a basic chat app.</string>
@@ -76,11 +75,6 @@
     <string name="no_internet_connection">No internet connection</string>
     <string name="unknown_error">An unknown error occurred</string>
 
-    <string name="title_anonymous_upgrade">FirebaseUI Anonymous Account Linking</string>
-    <string name="anonymous_sign_in">Anonymous Sign In</string>
-    <string name="launch_auth_ui">Launch Auth UI</string>
-    <string name="resolve_merge_conflict">Resolve Merge Conflict</string>
-
     <!-- Auth UI - Signed in -->
     <string name="signed_in_header">You are signed in!</string>
     <string name="sign_out">Sign out</string>
diff --git a/auth/README.md b/auth/README.md
index c59046b68..10d040bf5 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -38,7 +38,6 @@ and [Web](https://github.com/firebase/firebaseui-web/).
    1. [Silent sign-in](#silent-sign-in)
    1. [Sign out](#sign-out)
    1. [Account deletion](#deleting-accounts)
-   1. [Upgrading Anonymous Users](#upgrading-anonymous-users)
    1. [Auth flow chart](#authentication-flow-chart)
 1. [Customization](#ui-customization)
    1. [Required setup](#required-setup)
@@ -649,87 +648,6 @@ AuthUI.getInstance()
         });
 ```
 
-### Upgrading anonymous users
-
-#### Enabling anonymous user upgrade
-
-When an anonymous user signs in or signs up with a permanent account, you want
-to be sure that the user can continue with what they were doing before signing up.
-For example, an anonymous user might have items in their shopping cart.
-At check-out, you prompt the user to sign in or sign up. After the user is
-signed in, the user's shopping cart should contain any items the user added
-while signed in anonymously.
-
-To support this behavior, FirebaseUI makes it easy to "upgrade" an anonymous
-account to a permanent account. To do so, simply call `enableAnonymousUsersAutoUpgrade()`
-when you configure the sign-in UI (this option is disabled by default).
-
-For example: 
-```java
-startActivityForResult(
-    AuthUI.getInstance()
-        .createSignInIntentBuilder()
-        enableAnonymousUsersAutoUpgrade()
-        ...
-        .build(),
-    RC_SIGN_IN);
-```
-
-With this enabled, FirebaseUI will link the credential on sign-in with the anonymous account
-using Firebase Auth's `linkWithCredential` method: 
-```java
-FirebaseAuth.getInstance().getCurrentUser().linkWithCredential(permanentCredential);
-```
-
-#### Handling anonymous user upgrade merge conflicts
-
-There is an issue when an anonymous user tries to upgrade to an existing Firebase user. 
-
-For example, a user may have previously signed up with a Google credential on a different device. 
-If they are signed in anonymously and they attempt to upgrade with the existing Google account, 
-a `FirebaseAuthUserCollisionException` will be thrown by Firebase Auth as an existing user
-cannot be linked to another existing user. No two users can share the same credential. In this case, 
-we need to merge the data from both users before we can upgrade the anonymous user.
- 
-The process of storing the anonymous users data, signing in with the credential, and copying the
-data over to the existing account is left to the developer. 
-
-When linking is unsuccessful due to user collision, an error with code 
-`ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT` will be returned to `onActivityResult()`. A valid 
-non-anonymous credential can be obtained from the `IdpResponse` via `getCredentialForLinking()`.
-
-**Example:**
-```java
-@Override
-protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-    super.onActivityResult(requestCode, resultCode, data);
-    if (requestCode == RC_SIGN_IN) {
-        IdpResponse response = IdpResponse.fromResultIntent(data);
-        if (resultCode == RESULT_OK) {
-            // Successful sign in
-        } else {
-            // Sign in failed
-            if (response.getError().getErrorCode() == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
-                // Store relevant anonymous user data
-                ...
-                // Get the non-anoymous credential from the response
-                AuthCredential nonAnonymousCredential = response.getCredentialForLinking();
-                // Sign in with credential 
-                FirebaseAuth.getInstance().signInWithCredential(nonAnonymousCredential);
-                    .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
-                        @Override
-                        public void onSuccess(AuthResult result) {
-                            // Copy over anonymous user data to signed in user
-                            ...
-                        }
-                    });
-            }
-        }
-        updateUI();
-    }
-}
-```
-
 ### Authentication flow chart
 
 The authentication flow implemented on Android is more complex than on other
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 15914a4ba..7ede7b2bf 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -1,4 +1,3 @@
-
 import com.android.build.gradle.internal.dsl.TestOptions
 
 android {
@@ -43,7 +42,6 @@ dependencies {
     implementation(Config.Libs.Misc.retrofitGson)
 
     testImplementation(Config.Libs.Test.junit)
-    testImplementation(Config.Libs.Test.truth)
     testImplementation(Config.Libs.Test.mockito)
     testImplementation(Config.Libs.Test.robolectric)
     testImplementation(Config.Libs.Provider.facebook)
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 2ba5c6a05..6344d0b58 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -1167,23 +1167,10 @@ public Intent build() {
      * Builder for the intent to start the user authentication flow.
      */
     public final class SignInIntentBuilder extends AuthIntentBuilder<SignInIntentBuilder> {
-
-        private boolean mEnableAnonymousUpgrade;
-
         private SignInIntentBuilder() {
             super();
         }
 
-        /**
-         * Enables upgrading anonymous accounts to full accounts during the sign-in flow.
-         * This is disabled by default.
-         */
-        @NonNull
-        public SignInIntentBuilder enableAnonymousUsersAutoUpgrade() {
-            mEnableAnonymousUpgrade = true;
-            return this;
-        }
-
         @Override
         protected FlowParameters getFlowParams() {
             return new FlowParameters(
@@ -1194,8 +1181,7 @@ protected FlowParameters getFlowParams() {
                     mTosUrl,
                     mPrivacyPolicyUrl,
                     mEnableCredentials,
-                    mEnableHints,
-                    mEnableAnonymousUpgrade);
+                    mEnableHints);
         }
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ErrorCodes.java b/auth/src/main/java/com/firebase/ui/auth/ErrorCodes.java
index fca246ac4..f49a714bd 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ErrorCodes.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ErrorCodes.java
@@ -19,9 +19,7 @@ public final class ErrorCodes {
                     NO_NETWORK,
                     PLAY_SERVICES_UPDATE_CANCELLED,
                     DEVELOPER_ERROR,
-                    PROVIDER_ERROR,
-                    ANONYMOUS_UPGRADE_MERGE_CONFLICT,
-                    EMAIL_MISMATCH_ERROR
+                    PROVIDER_ERROR
             })
     @Retention(RetentionPolicy.SOURCE)
     public @interface Code {}
@@ -51,17 +49,6 @@ public final class ErrorCodes {
      */
     public static final int PROVIDER_ERROR = 4;
 
-    /**
-     * Anonymous account linking failed.
-     */
-    public static final int ANONYMOUS_UPGRADE_MERGE_CONFLICT = 5;
-
-    /**
-     * Signing in with a different email in the WelcomeBackIdp flow.
-     */
-    public static final int EMAIL_MISMATCH_ERROR = 6;
-
-
     private ErrorCodes() {
         throw new AssertionError("No instance for you!");
     }
@@ -80,11 +67,6 @@ public static String toFriendlyMessage(@Code int code) {
                 return "Developer error";
             case PROVIDER_ERROR:
                 return "Provider error";
-            case ANONYMOUS_UPGRADE_MERGE_CONFLICT:
-                return "User account merge conflict";
-            case EMAIL_MISMATCH_ERROR:
-                return "You are are attempting to sign in a different email than previously " +
-                        "provided";
             default:
                 throw new IllegalArgumentException("Unknown code: " + code);
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthAnonymousUpgradeException.java b/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthAnonymousUpgradeException.java
deleted file mode 100644
index 7f859f4a8..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthAnonymousUpgradeException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.firebase.ui.auth;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.RestrictTo;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class FirebaseAuthAnonymousUpgradeException extends Exception {
-
-    private IdpResponse mResponse;
-
-    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-    public FirebaseAuthAnonymousUpgradeException(@ErrorCodes.Code int code,
-                                                 @NonNull IdpResponse response) {
-        super(ErrorCodes.toFriendlyMessage(code));
-        mResponse = response;
-    }
-
-    public IdpResponse getResponse() {
-        return mResponse;
-    }
-}
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 18157aa5b..b0e24595e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
+++ b/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
@@ -25,7 +25,6 @@
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.google.firebase.auth.AuthResult;
-import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
 
@@ -45,8 +44,7 @@ public IdpResponse createFromParcel(Parcel in) {
                     in.readString(),
                     in.readString(),
                     in.readInt() == 1,
-                    (FirebaseUiException) in.readSerializable(),
-                    in.<AuthCredential>readParcelable(AuthCredential.class.getClassLoader())
+                    (FirebaseUiException) in.readSerializable()
             );
         }
 
@@ -57,7 +55,6 @@ public IdpResponse[] newArray(int size) {
     };
 
     private final User mUser;
-    private final AuthCredential mPendingCredential;
 
     private final String mToken;
     private final String mSecret;
@@ -66,7 +63,7 @@ public IdpResponse[] newArray(int size) {
     private final FirebaseUiException mException;
 
     private IdpResponse(@NonNull FirebaseUiException e) {
-        this(null, null, null, false, e, null);
+        this(null, null, null, false, e);
     }
 
     private IdpResponse(
@@ -74,11 +71,7 @@ private IdpResponse(
             @Nullable String token,
             @Nullable String secret,
             boolean isNewUser) {
-        this(user, token, secret, isNewUser, null, null);
-    }
-
-    private IdpResponse(AuthCredential credential, FirebaseUiException e) {
-        this(null, null, null, false, e, credential);
+        this(user, token, secret, isNewUser, null);
     }
 
     private IdpResponse(
@@ -86,14 +79,12 @@ private IdpResponse(
             String token,
             String secret,
             boolean isNewUser,
-            FirebaseUiException e,
-            AuthCredential credential) {
+            FirebaseUiException e) {
         mUser = user;
         mToken = token;
         mSecret = secret;
         mIsNewUser = isNewUser;
         mException = e;
-        mPendingCredential = credential;
     }
 
     /**
@@ -216,11 +207,6 @@ public FirebaseUiException getError() {
         return mException;
     }
 
-    @Nullable
-    public AuthCredential getCredentialForLinking() {
-        return mPendingCredential;
-    }
-
     @Override
     public int describeContents() {
         return 0;
@@ -255,8 +241,6 @@ public void writeToParcel(Parcel dest, int flags) {
                 } catch (IOException ignored) {}
             }
         }
-
-        dest.writeParcelable(mPendingCredential, 0);
     }
 
     @Override
@@ -270,9 +254,7 @@ public boolean equals(Object o) {
                 && (mToken == null ? response.mToken == null : mToken.equals(response.mToken))
                 && (mSecret == null ? response.mSecret == null : mSecret.equals(response.mSecret))
                 && (mIsNewUser == response.mIsNewUser)
-                && (mException == null ? response.mException == null : mException.equals(response.mException))
-                && (mPendingCredential == null ? response.mPendingCredential == null :
-                mPendingCredential.getProvider().equals(response.mPendingCredential.getProvider()));
+                && (mException == null ? response.mException == null : mException.equals(response.mException));
     }
 
     @Override
@@ -282,7 +264,6 @@ public int hashCode() {
         result = 31 * result + (mSecret == null ? 0 : mSecret.hashCode());
         result = 31 * result + (mIsNewUser ? 1 : 0);
         result = 31 * result + (mException == null ? 0 : mException.hashCode());
-        result = 31 * result + (mPendingCredential == null ? 0 : mPendingCredential.getProvider().hashCode());
         return result;
     }
 
@@ -294,14 +275,12 @@ public String toString() {
                 ", mSecret='" + mSecret + '\'' +
                 ", mIsNewUser='" + mIsNewUser + '\'' +
                 ", mException=" + mException +
-                ", mPendingCredential=" + mPendingCredential +
                 '}';
     }
 
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     public static class Builder {
         private final User mUser;
-        private final AuthCredential mPendingCredential;
 
         private String mToken;
         private String mSecret;
@@ -309,12 +288,6 @@ public static class Builder {
 
         public Builder(@NonNull User user) {
             mUser = user;
-            mPendingCredential = null;
-        }
-
-        public Builder(@NonNull AuthCredential pendingCredential) {
-            mUser = null;
-            mPendingCredential = pendingCredential;
         }
 
         public Builder(@NonNull IdpResponse response) {
@@ -322,7 +295,6 @@ public Builder(@NonNull IdpResponse response) {
             mToken = response.mToken;
             mSecret = response.mSecret;
             mIsNewUser = response.mIsNewUser;
-            mPendingCredential = response.mPendingCredential;
         }
 
         public Builder setNewUser(boolean newUser) {
@@ -341,10 +313,6 @@ public Builder setSecret(String secret) {
         }
 
         public IdpResponse build() {
-            if (mPendingCredential != null) {
-                return new IdpResponse(mPendingCredential, new FirebaseUiException(ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT));
-            }
-
             String providerId = mUser.getProviderId();
             if (!AuthUI.SUPPORTED_PROVIDERS.contains(providerId)) {
                 throw new IllegalStateException("Unknown provider: " + providerId);
@@ -358,6 +326,7 @@ public IdpResponse build() {
                 throw new IllegalStateException(
                         "Secret cannot be null when using the Twitter provider.");
             }
+
             return new IdpResponse(mUser, mToken, mSecret, mIsNewUser);
         }
     }
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 e1ad3104d..27438e7c3 100644
--- a/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
@@ -13,7 +13,6 @@
 import com.firebase.ui.auth.data.model.UserCancellationException;
 import com.firebase.ui.auth.data.remote.SignInKickstarter;
 import com.firebase.ui.auth.ui.InvisibleActivityBase;
-import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.tasks.OnFailureListener;
@@ -42,9 +41,6 @@ protected void onSuccess(@NonNull IdpResponse response) {
             protected void onFailure(@NonNull Exception e) {
                 if (e instanceof UserCancellationException) {
                     finish(RESULT_CANCELED, null);
-                } else if (e instanceof FirebaseAuthAnonymousUpgradeException) {
-                    IdpResponse res = ((FirebaseAuthAnonymousUpgradeException) e).getResponse();
-                    finish(RESULT_CANCELED, new Intent().putExtra(ExtraConstants.IDP_RESPONSE, res));
                 } else {
                     finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
                 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java b/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java
index 4cde51957..be4063b69 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java
@@ -56,7 +56,6 @@ public class FlowParameters implements Parcelable {
 
     public final boolean enableCredentials;
     public final boolean enableHints;
-    public final boolean enableAnonymousUpgrade;
 
     public FlowParameters(
             @NonNull String appName,
@@ -66,8 +65,7 @@ public FlowParameters(
             @Nullable String termsOfServiceUrl,
             @Nullable String privacyPolicyUrl,
             boolean enableCredentials,
-            boolean enableHints,
-            boolean enableAnonymousUpgrade) {
+            boolean enableHints) {
         this.appName = Preconditions.checkNotNull(appName, "appName cannot be null");
         this.providerInfo = Collections.unmodifiableList(
                 Preconditions.checkNotNull(providerInfo, "providerInfo cannot be null"));
@@ -77,7 +75,6 @@ public FlowParameters(
         this.privacyPolicyUrl = privacyPolicyUrl;
         this.enableCredentials = enableCredentials;
         this.enableHints = enableHints;
-        this.enableAnonymousUpgrade = enableAnonymousUpgrade;
     }
 
     /**
@@ -97,7 +94,6 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(privacyPolicyUrl);
         dest.writeInt(enableCredentials ? 1 : 0);
         dest.writeInt(enableHints ? 1 : 0);
-        dest.writeInt(enableAnonymousUpgrade ? 1 : 0);
     }
 
     @Override
@@ -116,7 +112,6 @@ public FlowParameters createFromParcel(Parcel in) {
             String privacyPolicyUrl = in.readString();
             boolean enableCredentials = in.readInt() != 0;
             boolean enableHints = in.readInt() != 0;
-            boolean enableAnonymousUpgrade = in.readInt() != 0;
 
             return new FlowParameters(
                     appName,
@@ -126,8 +121,7 @@ public FlowParameters createFromParcel(Parcel in) {
                     termsOfServiceUrl,
                     privacyPolicyUrl,
                     enableCredentials,
-                    enableHints,
-                    enableAnonymousUpgrade);
+                    enableHints);
         }
 
         @Override
@@ -147,8 +141,4 @@ public boolean isTermsOfServiceUrlProvided() {
     public boolean isPrivacyPolicyUrlProvided() {
         return !TextUtils.isEmpty(privacyPolicyUrl);
     }
-
-    public boolean isAnonymousUpgradeEnabled() {
-        return enableAnonymousUpgrade;
-    }
 }
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 67c8d5fd3..f65cc01cd 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
@@ -6,7 +6,6 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 
-import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.data.model.UserCancellationException;
@@ -30,9 +29,7 @@ public void startSignIn(@NonNull HelperActivityBase activity) {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        if (resultCode == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
-            // The activity deals with this case. This conflict is handled by the developer.
-        } else if (requestCode == RequestCodes.EMAIL_FLOW) {
+        if (requestCode == RequestCodes.EMAIL_FLOW) {
             IdpResponse response = IdpResponse.fromResultIntent(data);
             if (response == null) {
                 setResult(Resource.<IdpResponse>forFailure(new UserCancellationException()));
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 5a6826576..e99c57d37 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
@@ -9,7 +9,6 @@
 import android.text.TextUtils;
 
 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.IntentRequiredException;
 import com.firebase.ui.auth.data.model.PendingIntentRequiredException;
@@ -184,9 +183,6 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
                     setResult(Resource.<IdpResponse>forFailure(new UserCancellationException()));
                 } else if (response.isSuccessful()) {
                     setResult(Resource.forSuccess(response));
-                } else if (response.getError().getErrorCode() ==
-                        ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
-                    handleMergeFailure(response);
                 } else {
                     setResult(Resource.<IdpResponse>forFailure(response.getError()));
                 }
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 3a017d0bb..7afb3c727 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
@@ -8,7 +8,6 @@
 import android.support.annotation.RestrictTo;
 import android.support.v7.app.AppCompatActivity;
 
-import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.ui.credentials.CredentialSaveActivity;
@@ -40,8 +39,7 @@ protected static Intent createBaseIntent(
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         // Forward the results of Smart Lock saving
-        if (requestCode == RequestCodes.CRED_SAVE_FLOW
-                || resultCode == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
+        if (requestCode == RequestCodes.CRED_SAVE_FLOW) {
             finish(resultCode, data);
         }
     }
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 80930de72..cd0e1130d 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
@@ -212,7 +212,7 @@ public void showProgress(int message) {
 
     @Override
     public void hideProgress() {
-        mNextButton.setEnabled(true);
-        mProgressBar.setVisibility(View.INVISIBLE);
+       mNextButton.setEnabled(true);
+       mProgressBar.setVisibility(View.INVISIBLE);
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailActivity.java
index 2b21c2f94..6e0bb14e7 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailActivity.java
@@ -25,7 +25,6 @@
 import android.support.v4.view.ViewCompat;
 
 import com.firebase.ui.auth.AuthUI;
-import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
@@ -43,8 +42,7 @@
  * WelcomeBackIdpPrompt}.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class EmailActivity extends AppCompatBase implements CheckEmailFragment.CheckEmailListener,
-        RegisterEmailFragment.AnonymousUpgradeListener {
+public class EmailActivity extends AppCompatBase implements CheckEmailFragment.CheckEmailListener {
     public static Intent createIntent(Context context, FlowParameters flowParams) {
         return createIntent(context, flowParams, null);
     }
@@ -143,9 +141,4 @@ public void showProgress(@StringRes int message) {
     public void hideProgress() {
         throw new UnsupportedOperationException("Email fragments must handle progress updates.");
     }
-
-    @Override
-    public void onMergeFailure(IdpResponse response) {
-        finish(ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT, response.toIntent());
-    }
 }
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 2dd7d6938..cee53d4b5 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
@@ -7,7 +7,6 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.support.design.widget.TextInputLayout;
-import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,7 +17,6 @@
 import android.widget.TextView;
 
 import com.firebase.ui.auth.AuthUI;
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.User;
@@ -61,21 +59,8 @@ public class RegisterEmailFragment extends FragmentBase implements
     private PasswordFieldValidator mPasswordFieldValidator;
     private BaseValidator mNameValidator;
 
-    private AnonymousUpgradeListener mListener;
     private User mUser;
 
-    /**
-     * Interface to be implemented by Activities hosting this Fragment.
-     */
-    interface AnonymousUpgradeListener {
-
-        /**
-         * Email belongs to an existing user - failed to merge anonymous user.
-         */
-        void onMergeFailure(IdpResponse response);
-
-    }
-
     public static RegisterEmailFragment newInstance(User user) {
         RegisterEmailFragment fragment = new RegisterEmailFragment();
         Bundle args = new Bundle();
@@ -113,9 +98,6 @@ protected void onFailure(@NonNull Exception e) {
                             R.integer.fui_min_password_length));
                 } else if (e instanceof FirebaseAuthInvalidCredentialsException) {
                     mEmailInput.setError(getString(R.string.fui_invalid_email_address));
-                } else if (e instanceof FirebaseAuthAnonymousUpgradeException) {
-                    IdpResponse response = ((FirebaseAuthAnonymousUpgradeException) e).getResponse();
-                    mListener.onMergeFailure(response);
                 } else {
                     // General error message, this branch should not be invoked but
                     // covers future API changes
@@ -215,13 +197,7 @@ public void run() {
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        FragmentActivity activity = requireActivity();
-        activity.setTitle(R.string.fui_title_register_email);
-        if (!(activity instanceof AnonymousUpgradeListener)) {
-            throw new IllegalStateException("Activity must implement CheckEmailListener");
-        }
-        mListener = (AnonymousUpgradeListener) activity;
-
+        requireActivity().setTitle(R.string.fui_title_register_email);
     }
 
     @Override
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 45218c32d..2c2ace31e 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
@@ -35,8 +35,6 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.firebase.ui.auth.ErrorCodes;
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
@@ -122,12 +120,7 @@ protected void onSuccess(@NonNull IdpResponse response) {
 
             @Override
             protected void onFailure(@NonNull Exception e) {
-                if (e instanceof FirebaseAuthAnonymousUpgradeException) {
-                    IdpResponse response = ((FirebaseAuthAnonymousUpgradeException) e).getResponse();
-                    finish(ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT, response.toIntent());
-                } else {
-                    mPasswordLayout.setError(getString(getErrorMessage(e)));
-                }
+                mPasswordLayout.setError(getString(getErrorMessage(e)));
             }
         });
 
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 e036e70b6..4f9c78333 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
@@ -34,9 +34,6 @@
 
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
-import com.firebase.ui.auth.ErrorCodes;
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
-import com.firebase.ui.auth.FirebaseUiException;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
@@ -115,14 +112,9 @@ protected void onSuccess(@NonNull IdpResponse response) {
 
             @Override
             protected void onFailure(@NonNull Exception e) {
-                if (e instanceof FirebaseAuthAnonymousUpgradeException) {
-                    finish(ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT,
-                            ((FirebaseAuthAnonymousUpgradeException) e).getResponse().toIntent());
-                } else if ((!(e instanceof UserCancellationException))) {
-                    String text = e instanceof FirebaseUiException ? e.getMessage() :
-                            getString(R.string.fui_error_unknown);
+                if (!(e instanceof UserCancellationException)) {
                     Toast.makeText(AuthMethodPickerActivity.this,
-                            text,
+                            R.string.fui_error_unknown,
                             Toast.LENGTH_SHORT).show();
                 }
             }
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 ae5634026..910bc7c20 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
@@ -31,7 +31,6 @@
 
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.ErrorCodes;
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
 import com.firebase.ui.auth.FirebaseUiException;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
@@ -91,9 +90,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 supplier.get(LinkingSocialProviderResponseHandler.class);
         handler.init(getFlowParams());
         if (requestedUserResponse != null) {
-            handler.setRequestedSignInCredentialForEmail(
-                    ProviderUtils.getAuthCredential(requestedUserResponse),
-                    existingUser.getEmail());
+            handler.setRequestedSignInCredential(
+                    ProviderUtils.getAuthCredential(requestedUserResponse));
         }
 
         String providerId = existingUser.getProviderId();
@@ -174,12 +172,7 @@ protected void onSuccess(@NonNull IdpResponse response) {
 
             @Override
             protected void onFailure(@NonNull Exception e) {
-                if (e instanceof FirebaseAuthAnonymousUpgradeException) {
-                    IdpResponse response = ((FirebaseAuthAnonymousUpgradeException) e).getResponse();
-                    finish(ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT, response.toIntent());
-                } else {
-                    finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
-                }
+                finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
             }
         });
 
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 431e6e379..f843d3add 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
@@ -24,8 +24,6 @@
 import android.support.design.widget.TextInputLayout;
 import android.widget.Toast;
 
-import com.firebase.ui.auth.ErrorCodes;
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
@@ -142,10 +140,7 @@ private void handleError(@Nullable Exception e) {
         TextInputLayout errorView = getErrorView();
         if (errorView == null) { return; }
 
-        if (e instanceof FirebaseAuthAnonymousUpgradeException) {
-            IdpResponse response = ((FirebaseAuthAnonymousUpgradeException) e).getResponse();
-            finish(ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT, response.toIntent());
-        } else if (e instanceof FirebaseAuthException) {
+        if (e instanceof FirebaseAuthException) {
             errorView.setError(getErrorMessage(
                     FirebaseAuthError.fromException((FirebaseAuthException) e)));
         } else if (e != null) {
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
deleted file mode 100644
index 1a5288a5d..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/util/data/AuthOperationManager.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.firebase.ui.auth.util.data;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.VisibleForTesting;
-
-import com.firebase.ui.auth.data.model.FlowParameters;
-import com.google.android.gms.tasks.Continuation;
-import com.google.android.gms.tasks.Task;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.auth.AuthCredential;
-import com.google.firebase.auth.AuthResult;
-import com.google.firebase.auth.EmailAuthProvider;
-import com.google.firebase.auth.FirebaseAuth;
-
-/**
- * Utilities to help with Anonymous user upgrade.
- */
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class AuthOperationManager {
-
-    private static String firebaseAppName = "FUIScratchApp";
-
-    private static AuthOperationManager mAuthManager;
-
-    @VisibleForTesting
-    public FirebaseAuth mScratchAuth;
-
-    private AuthOperationManager() {}
-
-    public static synchronized AuthOperationManager getInstance() {
-        if (mAuthManager == null) {
-            mAuthManager = new AuthOperationManager();
-        }
-        return mAuthManager;
-    }
-
-    private FirebaseApp getScratchApp(FirebaseApp defaultApp) {
-        try {
-            return FirebaseApp.getInstance(firebaseAppName);
-        } catch (IllegalStateException e) {
-            return FirebaseApp.initializeApp(defaultApp.getApplicationContext(),
-                    defaultApp.getOptions(), firebaseAppName);
-        }
-    }
-
-    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));
-        }
-        return mScratchAuth;
-    }
-
-    public Task<AuthResult> createOrLinkUserWithEmailAndPassword(@NonNull FirebaseAuth auth,
-                                                                 @NonNull FlowParameters flowParameters,
-                                                                 @NonNull String email,
-                                                                 @NonNull String password) {
-        if (canUpgradeAnonymous(auth, flowParameters)) {
-            AuthCredential credential = EmailAuthProvider.getCredential(email, password);
-            return auth.getCurrentUser().linkWithCredential(credential);
-        } else {
-            return auth.createUserWithEmailAndPassword(email, password);
-        }
-    }
-
-    public Task<AuthResult> signInAndLinkWithCredential(@NonNull FirebaseAuth auth,
-                                                        @NonNull FlowParameters flowParameters,
-                                                        @NonNull AuthCredential credential) {
-        if (canUpgradeAnonymous(auth, flowParameters)) {
-            return auth.getCurrentUser().linkWithCredential(credential);
-        } else {
-            return auth.signInWithCredential(credential);
-        }
-    }
-
-    public boolean canUpgradeAnonymous(FirebaseAuth auth, FlowParameters flowParameters) {
-        return flowParameters.isAnonymousUpgradeEnabled() && auth.getCurrentUser() != null &&
-                auth.getCurrentUser().isAnonymous();
-    }
-
-    @NonNull
-    public Task<AuthResult> validateCredential(AuthCredential credential,
-                                               FlowParameters flowParameters) {
-        return getScratchAuth(flowParameters).signInWithCredential(credential);
-    }
-
-    public Task<AuthResult> safeLink(final AuthCredential credential,
-                                     final AuthCredential credentialToLink,
-                                     final FlowParameters flowParameters) {
-        return getScratchAuth(flowParameters)
-                .signInWithCredential(credential)
-                .continueWithTask(new Continuation<AuthResult, Task<AuthResult>>() {
-                    @Override
-                    public Task<AuthResult> then(@NonNull Task<AuthResult> task) throws Exception {
-                        if (task.isSuccessful()) {
-                            return task.getResult().getUser().linkWithCredential(credentialToLink);
-                        }
-                        return task;
-                    }
-                });
-    }
-}
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/data/ProviderUtils.java b/auth/src/main/java/com/firebase/ui/auth/util/data/ProviderUtils.java
index 6f3254607..e3e22d5ff 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/data/ProviderUtils.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/data/ProviderUtils.java
@@ -21,7 +21,6 @@
 
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.util.Preconditions;
 import com.google.android.gms.auth.api.credentials.IdentityProviders;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
@@ -181,14 +180,4 @@ public String then(@NonNull Task<String> task) {
                     }
                 });
     }
-
-    public static String getTopProvider(@NonNull List<String> providers) {
-        return providers == null || providers.isEmpty() ? null :
-                providers.get(providers.size() - 1);
-    }
-
-    public static boolean isExistingProvider(@NonNull List<String> providers, String provider) {
-        if (providers == null) throw new IllegalArgumentException("The list of providers is null.");
-        return providers.contains(provider);
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/SignInViewModelBase.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/SignInViewModelBase.java
index b47a6f6ec..440563c25 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/SignInViewModelBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/SignInViewModelBase.java
@@ -4,11 +4,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
 
-import com.firebase.ui.auth.ErrorCodes;
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.Resource;
-import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@@ -25,16 +22,4 @@ protected void setResult(Resource<IdpResponse> output) {
     protected void handleSuccess(@NonNull IdpResponse response, @NonNull AuthResult result) {
         setResult(Resource.forSuccess(response.withResult(result)));
     }
-
-    protected void handleMergeFailure(@NonNull AuthCredential credential) {
-        IdpResponse failureResponse = new IdpResponse.Builder(credential).build();
-        handleMergeFailure(failureResponse);
-    }
-
-    protected void handleMergeFailure(@NonNull IdpResponse failureResponse) {
-        setResult(Resource.<IdpResponse>forFailure(new FirebaseAuthAnonymousUpgradeException(
-                ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT,
-                failureResponse)));
-    }
-
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/EmailProviderResponseHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/EmailProviderResponseHandler.java
index 6287cb13f..0ba3dfb20 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/EmailProviderResponseHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/EmailProviderResponseHandler.java
@@ -11,14 +11,12 @@
 import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.email.WelcomeBackPasswordPrompt;
 import com.firebase.ui.auth.ui.idp.WelcomeBackIdpPrompt;
-import com.firebase.ui.auth.util.data.AuthOperationManager;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
 import com.firebase.ui.auth.viewmodel.SignInViewModelBase;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
@@ -31,7 +29,7 @@ public EmailProviderResponseHandler(Application application) {
         super(application);
     }
 
-    public void startSignIn(@NonNull final IdpResponse response, @NonNull final String password) {
+    public void startSignIn(@NonNull final IdpResponse response, @NonNull String password) {
         if (!response.isSuccessful()) {
             setResult(Resource.<IdpResponse>forFailure(response.getError()));
             return;
@@ -42,12 +40,8 @@ public void startSignIn(@NonNull final IdpResponse response, @NonNull final Stri
         }
         setResult(Resource.<IdpResponse>forLoading());
 
-        final AuthOperationManager authOperationManager = AuthOperationManager.getInstance();
         final String email = response.getEmail();
-        authOperationManager.createOrLinkUserWithEmailAndPassword(getAuth(),
-                getArguments(),
-                email,
-                password)
+        getAuth().createUserWithEmailAndPassword(email, password)
                 .continueWithTask(new ProfileMerger(response))
                 .addOnFailureListener(new TaskFailureLogger(TAG, "Error creating user"))
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
@@ -60,24 +54,16 @@ public void onSuccess(AuthResult result) {
                     @Override
                     public void onFailure(@NonNull Exception e) {
                         if (e instanceof FirebaseAuthUserCollisionException) {
-                            if (authOperationManager.canUpgradeAnonymous(getAuth(),
-                                    getArguments())) {
-                                AuthCredential credential = EmailAuthProvider.getCredential(email,
-                                        password);
-                                handleMergeFailure(credential);
-                            } else {
-                                // Collision with existing user email without anonymous upgrade
-                                // it should be very hard for the user to even get to this error
-                                // due to CheckEmailFragment.
-                                ProviderUtils.fetchTopProvider(getAuth(), email)
-                                        .addOnSuccessListener(new StartWelcomeBackFlow(email))
-                                        .addOnFailureListener(new OnFailureListener() {
-                                            @Override
-                                            public void onFailure(@NonNull Exception e) {
-                                                setResult(Resource.<IdpResponse>forFailure(e));
-                                            }
-                                        });
-                            }
+                            // Collision with existing user email, it should be very hard for
+                            // the user to even get to this error due to CheckEmailFragment.
+                            ProviderUtils.fetchTopProvider(getAuth(), email)
+                                    .addOnSuccessListener(new StartWelcomeBackFlow(email))
+                                    .addOnFailureListener(new OnFailureListener() {
+                                        @Override
+                                        public void onFailure(@NonNull Exception e) {
+                                            setResult(Resource.<IdpResponse>forFailure(e));
+                                        }
+                                    });
                         } else {
                             setResult(Resource.<IdpResponse>forFailure(e));
                         }
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 dbd860094..1527b11b6 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
@@ -5,18 +5,14 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 
-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.data.model.User;
 import com.firebase.ui.auth.data.remote.ProfileMerger;
-import com.firebase.ui.auth.util.data.AuthOperationManager;
 import com.firebase.ui.auth.util.data.TaskFailureLogger;
 import com.firebase.ui.auth.viewmodel.SignInViewModelBase;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.auth.AuthCredential;
@@ -65,80 +61,38 @@ public void startSignIn(@NonNull final String email,
                     .build();
         }
 
-        final AuthOperationManager authOperationManager = AuthOperationManager.getInstance();
-        if (authOperationManager.canUpgradeAnonymous(getAuth(), getArguments())) {
-            final AuthCredential credToValidate = EmailAuthProvider.getCredential(email, password);
+        // Kick off the flow including signing in, linking accounts, and saving with SmartLock
+        getAuth().signInWithEmailAndPassword(email, password)
+                .continueWithTask(new Continuation<AuthResult, Task<AuthResult>>() {
+                    @Override
+                    public Task<AuthResult> then(@NonNull Task<AuthResult> task) throws Exception {
+                        // Forward task failure by asking for result
+                        AuthResult result = task.getResult(Exception.class);
 
-            // Check to see if we need to link (for social providers with the same email)
-            if (AuthUI.SOCIAL_PROVIDERS.contains(inputResponse.getProviderType())) {
-                // Add the provider to the same account before triggering a merge failure.
-                authOperationManager.safeLink(credToValidate, credential, getArguments())
-                        .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
-                            @Override
-                            public void onSuccess(AuthResult result) {
-                                handleMergeFailure(credToValidate);
-                            }
-                        })
-                        .addOnFailureListener(new OnFailureListener() {
-                            @Override
-                            public void onFailure(@NonNull Exception e) {
-                                setResult(Resource.<IdpResponse>forFailure(e));
-                            }
-                        });
-            } else {
-                // The user has not tried to log in with a federated IDP containing the same email.
-                // In this case, we just need to verify that the credential they provided is valid.
-                // No linking is done for non-federated IDPs.
-                // A merge failure occurs because the account exists and the user is anonymous.
-                authOperationManager.validateCredential(credToValidate, getArguments())
-                        .addOnCompleteListener(
-                                new OnCompleteListener<AuthResult>() {
-                                    @Override
-                                    public void onComplete(@NonNull Task<AuthResult> task) {
-                                        if (task.isSuccessful()) {
-                                            handleMergeFailure(credToValidate);
-                                        } else {
-                                            setResult(Resource.<IdpResponse>forFailure(task.getException()));
-                                        }
-                                    }
-                                });
-            }
-        } else {
-            // Kick off the flow including signing in, linking accounts, and saving with SmartLock
-            getAuth().signInWithEmailAndPassword(email, password)
-                    .continueWithTask(new Continuation<AuthResult, Task<AuthResult>>() {
-                        @Override
-                        public Task<AuthResult> then(@NonNull Task<AuthResult> task) throws Exception {
-                            // Forward task failure by asking for result
-                            AuthResult result = task.getResult(Exception.class);
-
-                            // Task succeeded, link user if necessary
-                            if (credential == null) {
-                                return Tasks.forResult(result);
-                            } else {
-                                return result.getUser()
-                                        .linkWithCredential(credential)
-                                        .continueWithTask(new ProfileMerger(outputResponse))
-                                        .addOnFailureListener(new TaskFailureLogger(TAG,
-                                                "linkWithCredential+merge failed."));
-                            }
-                        }
-                    })
-                    .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
-                        @Override
-                        public void onSuccess(AuthResult result) {
-                            handleSuccess(outputResponse, result);
+                        // Task succeeded, link user if necessary
+                        if (credential == null) {
+                            return Tasks.forResult(result);
+                        } else {
+                            return result.getUser()
+                                    .linkWithCredential(credential)
+                                    .continueWithTask(new ProfileMerger(outputResponse))
+                                    .addOnFailureListener(new TaskFailureLogger(TAG, "linkWithCredential+merge failed."));
                         }
-                    })
-                    .addOnFailureListener(new OnFailureListener() {
-                        @Override
-                        public void onFailure(@NonNull Exception e) {
-                            setResult(Resource.<IdpResponse>forFailure(e));
+                    }
+                })
+                .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
+                    @Override
+                    public void onComplete(@NonNull Task<AuthResult> task) {
+                        if (!task.isSuccessful()) {
+                            setResult(Resource.<IdpResponse>forFailure(task.getException()));
+                            return;
                         }
-                    })
-                    .addOnFailureListener(
-                            new TaskFailureLogger(TAG, "signInWithEmailAndPassword failed."));
-        }
+
+                        handleSuccess(outputResponse, task.getResult());
+                    }
+                })
+                .addOnFailureListener(
+                        new TaskFailureLogger(TAG, "signInWithEmailAndPassword failed."));
     }
 
     /**
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java
index 76e3ff152..96b3a6aef 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/LinkingSocialProviderResponseHandler.java
@@ -6,34 +6,28 @@
 import android.support.annotation.RestrictTo;
 
 import com.firebase.ui.auth.AuthUI;
-import com.firebase.ui.auth.ErrorCodes;
-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.util.data.AuthOperationManager;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.viewmodel.SignInViewModelBase;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.FirebaseUser;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class LinkingSocialProviderResponseHandler extends SignInViewModelBase {
     private AuthCredential mRequestedSignInCredential;
-    private String mEmail;
+
     public LinkingSocialProviderResponseHandler(Application application) {
         super(application);
     }
 
-    public void setRequestedSignInCredentialForEmail(@Nullable AuthCredential credential,
-                                                     @Nullable String email) {
+    public void setRequestedSignInCredential(@Nullable AuthCredential credential) {
         mRequestedSignInCredential = credential;
-        mEmail = email;
     }
 
     public void startSignIn(@NonNull final IdpResponse response) {
@@ -45,46 +39,11 @@ public void startSignIn(@NonNull final IdpResponse response) {
             throw new IllegalStateException(
                     "This handler cannot be used to link email or phone providers");
         }
-        if (mEmail != null && !mEmail.equals(response.getEmail())) {
-            setResult(Resource.<IdpResponse>forFailure(new FirebaseUiException
-                    (ErrorCodes.EMAIL_MISMATCH_ERROR)));
-            return;
-        }
-
         setResult(Resource.<IdpResponse>forLoading());
 
-        final AuthOperationManager authOperationManager = AuthOperationManager.getInstance();
-        final AuthCredential credential = ProviderUtils.getAuthCredential(response);
-
-        if (authOperationManager.canUpgradeAnonymous(getAuth(), getArguments())) {
-            if (mRequestedSignInCredential == null) {
-                // The user has provided a valid credential by signing in with a federated
-                // idp. linkWithCredential will fail because the user is anonymous and the account
-                // exists (we're in the welcome back flow).
-                // We know that they are signing in with the same IDP because requestSignInCredential
-                // is null.
-                // We just need to have the developer handle the merge failure.
-                handleMergeFailure(credential);
-            } else {
-                // The user has logged in with an IDP that has the same email with another IDP
-                // present on the account.
-                // These IDPs belong to the same account - they must be linked, but we can't lose
-                // our anonymous user session
-                authOperationManager.safeLink(credential, mRequestedSignInCredential, getArguments())
-                        .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
-                            @Override
-                            public void onSuccess(AuthResult result) {
-                                handleMergeFailure(credential);
-                            }
-                        })
-                        .addOnFailureListener(new OnFailureListener() {
-                            @Override
-                            public void onFailure(@NonNull Exception e) {
-                                setResult(Resource.<IdpResponse>forFailure(e));
-                            }
-                        });
-            }
-        } else {
+        AuthCredential credential = ProviderUtils.getAuthCredential(response);
+        FirebaseUser currentUser = getCurrentUser();
+        if (currentUser == null) {
             getAuth().signInWithCredential(credential)
                     .continueWithTask(new Continuation<AuthResult, Task<AuthResult>>() {
                         @Override
@@ -120,6 +79,16 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                             }
                         }
                     });
+        } else {
+            currentUser.linkWithCredential(credential)
+                    .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
+                        @Override
+                        public void onComplete(@NonNull Task<AuthResult> task) {
+                            // I'm not sure why we ignore failures here, but this mirrors previous
+                            // behavior.
+                            handleSuccess(response, task.getResult());
+                        }
+                    });
         }
     }
 }
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 1ad639957..42c38b7ff 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
@@ -17,19 +17,14 @@
 import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.email.WelcomeBackPasswordPrompt;
 import com.firebase.ui.auth.ui.idp.WelcomeBackIdpPrompt;
-import com.firebase.ui.auth.util.data.AuthOperationManager;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
 import com.firebase.ui.auth.viewmodel.SignInViewModelBase;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
-import com.google.firebase.auth.SignInMethodQueryResult;
-
-import java.util.List;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class SocialProviderResponseHandler extends SignInViewModelBase {
@@ -46,15 +41,9 @@ public void startSignIn(@NonNull final IdpResponse response) {
             throw new IllegalStateException(
                     "This handler cannot be used with email or phone providers");
         }
-
         setResult(Resource.<IdpResponse>forLoading());
 
-        final AuthCredential credential = ProviderUtils.getAuthCredential(response);
-
-        AuthOperationManager.getInstance().signInAndLinkWithCredential(
-                getAuth(),
-                getArguments(),
-                credential)
+        getAuth().signInWithCredential(ProviderUtils.getAuthCredential(response))
                 .continueWithTask(new ProfileMerger(response))
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                     @Override
@@ -64,79 +53,27 @@ public void onSuccess(AuthResult result) {
                 })
                 .addOnFailureListener(new OnFailureListener() {
                     @Override
-                    public void onFailure(@NonNull final Exception e) {
-                        if (e instanceof FirebaseAuthUserCollisionException) {
-                            final String email = response.getEmail();
-                            if (email == null) {
-                                setResult(Resource.<IdpResponse>forFailure(e));
+                    public void onFailure(@NonNull Exception e) {
+                        String email = response.getEmail();
+                        if (email != null) {
+                            if (e instanceof FirebaseAuthUserCollisionException) {
+                                ProviderUtils.fetchTopProvider(getAuth(), email)
+                                        .addOnSuccessListener(
+                                                new StartWelcomeBackFlow(response))
+                                        .addOnFailureListener(new OnFailureListener() {
+                                            @Override
+                                            public void onFailure(@NonNull Exception e) {
+                                                setResult(Resource.<IdpResponse>forFailure(e));
+                                            }
+                                        });
                                 return;
                             }
-                            // There can be a collision due to:
-                            // CASE 1: Anon user signing in with a credential that belongs to an
-                            // existing user.
-                            // CASE 2: non - anon user signing in with a credential that does not
-                            // belong to an existing user, but the email matches an existing user
-                            // that has another social IDP. We need to link this new IDP to this
-                            // existing user.
-                            // CASE 3: CASE 2 with an anonymous user. We link the new IDP to the
-                            // same account before handling invoking a merge failure.
-                            getAuth().fetchSignInMethodsForEmail(email)
-                                    .addOnSuccessListener(new OnSuccessListener<SignInMethodQueryResult>() {
-                                        @Override
-                                        public void onSuccess(SignInMethodQueryResult result) {
-                                            List<String> providers = result.getSignInMethods();
-                                            if (ProviderUtils.isExistingProvider(providers,
-                                                    response.getProviderType())) {
-                                                // Case 1
-                                                handleMergeFailure(credential);
-                                            } else {
-                                                // Case 2 & 3 - we need to link
-                                                startWelcomeBackFlowForLinking(
-                                                        ProviderUtils.getTopProvider(providers),
-                                                        response);
-                                            }
-                                        }
-                                    })
-                                    .addOnFailureListener(new OnFailureListener() {
-                                        @Override
-                                        public void onFailure(@NonNull Exception e) {
-                                            setResult(Resource.<IdpResponse>forFailure(
-                                                    e));
-                                        }
-                                    });
                         }
+                        setResult(Resource.<IdpResponse>forFailure(e));
                     }
                 });
     }
 
-    public void startWelcomeBackFlowForLinking(String provider, IdpResponse response) {
-        if (provider == null) {
-            throw new IllegalStateException(
-                    "No provider even though we received a FirebaseAuthUserCollisionException");
-        }
-
-        if (provider.equals(EmailAuthProvider.PROVIDER_ID)) {
-            // Start email welcome back flow
-            setResult(Resource.<IdpResponse>forFailure(new IntentRequiredException(
-                    WelcomeBackPasswordPrompt.createIntent(
-                            getApplication(),
-                            getArguments(),
-                            response),
-                    RequestCodes.ACCOUNT_LINK_FLOW
-            )));
-        } else {
-            // Start Idp welcome back flow
-            setResult(Resource.<IdpResponse>forFailure(new IntentRequiredException(
-                    WelcomeBackIdpPrompt.createIntent(
-                            getApplication(),
-                            getArguments(),
-                            new User.Builder(provider, response.getEmail()).build(),
-                            response),
-                    RequestCodes.ACCOUNT_LINK_FLOW
-            )));
-        }
-    }
-
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         if (requestCode == RequestCodes.ACCOUNT_LINK_FLOW) {
             IdpResponse response = IdpResponse.fromResultIntent(data);
@@ -155,4 +92,40 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
         }
     }
 
+    private class StartWelcomeBackFlow implements OnSuccessListener<String> {
+        private final IdpResponse mResponse;
+
+        public StartWelcomeBackFlow(IdpResponse response) {
+            mResponse = response;
+        }
+
+        @Override
+        public void onSuccess(String provider) {
+            if (provider == null) {
+                throw new IllegalStateException(
+                        "No provider even though we received a FirebaseAuthUserCollisionException");
+            }
+
+            if (provider.equals(EmailAuthProvider.PROVIDER_ID)) {
+                // Start email welcome back flow
+                setResult(Resource.<IdpResponse>forFailure(new IntentRequiredException(
+                        WelcomeBackPasswordPrompt.createIntent(
+                                getApplication(),
+                                getArguments(),
+                                mResponse),
+                        RequestCodes.ACCOUNT_LINK_FLOW
+                )));
+            } else {
+                // Start Idp welcome back flow
+                setResult(Resource.<IdpResponse>forFailure(new IntentRequiredException(
+                        WelcomeBackIdpPrompt.createIntent(
+                                getApplication(),
+                                getArguments(),
+                                new User.Builder(provider, mResponse.getEmail()).build(),
+                                mResponse),
+                        RequestCodes.ACCOUNT_LINK_FLOW
+                )));
+            }
+        }
+    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/phone/PhoneProviderResponseHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/phone/PhoneProviderResponseHandler.java
index 4c8d5387f..cf7a702ff 100644
--- a/auth/src/main/java/com/firebase/ui/auth/viewmodel/phone/PhoneProviderResponseHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/viewmodel/phone/PhoneProviderResponseHandler.java
@@ -6,12 +6,10 @@
 
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.Resource;
-import com.firebase.ui.auth.util.data.AuthOperationManager;
 import com.firebase.ui.auth.viewmodel.SignInViewModelBase;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthResult;
-import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.PhoneAuthCredential;
 import com.google.firebase.auth.PhoneAuthProvider;
 
@@ -31,27 +29,16 @@ public void startSignIn(@NonNull PhoneAuthCredential credential,
             throw new IllegalStateException(
                     "This handler cannot be used without a phone response.");
         }
-
         setResult(Resource.<IdpResponse>forLoading());
 
-        AuthOperationManager.getInstance()
-                .signInAndLinkWithCredential(getAuth(), getArguments(), credential)
-                .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
-                    @Override
-                    public void onSuccess(AuthResult result) {
-                        handleSuccess(response, result);
-                    }
-                })
-                .addOnFailureListener(new OnFailureListener() {
+        getAuth().signInWithCredential(credential)
+                .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
                     @Override
-                    public void onFailure(@NonNull Exception e) {
-                        if (e instanceof FirebaseAuthUserCollisionException) {
-                            // With phone auth, this only happens if we are trying to upgrade
-                            // an anonymous account using a phone number that is already registered
-                            // on another account
-                            handleMergeFailure(((FirebaseAuthUserCollisionException) e).getUpdatedCredential());
+                    public void onComplete(@NonNull Task<AuthResult> task) {
+                        if (task.isSuccessful()) {
+                            handleSuccess(response, task.getResult());
                         } else {
-                            setResult(Resource.<IdpResponse>forFailure(e));
+                            setResult(Resource.<IdpResponse>forFailure(task.getException()));
                         }
                     }
                 });
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 6ca3d5fa5..edffa1a26 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
@@ -100,11 +100,6 @@ public static FirebaseUser getMockFirebaseUser() {
     }
 
     public static FlowParameters getFlowParameters(Collection<String> providerIds) {
-        return getFlowParameters(providerIds, false);
-    }
-
-    public static FlowParameters getFlowParameters(Collection<String> providerIds,
-                                                   boolean enableAnonymousUpgrade) {
         List<IdpConfig> idpConfigs = new ArrayList<>();
         for (String providerId : providerIds) {
             switch (providerId) {
@@ -141,9 +136,7 @@ public static FlowParameters getFlowParameters(Collection<String> providerIds,
                 null,
                 null,
                 true,
-                true,
-                enableAnonymousUpgrade);
+                true);
     }
 
-
 }
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
deleted file mode 100644
index d8686a2a2..000000000
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package com.firebase.ui.auth.viewmodel;
-
-import android.arch.lifecycle.Observer;
-
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
-import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.data.model.FlowParameters;
-import com.firebase.ui.auth.data.model.Resource;
-import com.firebase.ui.auth.data.model.User;
-import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
-import com.firebase.ui.auth.testhelpers.AutoContinueTask;
-import com.firebase.ui.auth.testhelpers.FakeAuthResult;
-import com.firebase.ui.auth.testhelpers.ResourceMatchers;
-import com.firebase.ui.auth.testhelpers.TestConstants;
-import com.firebase.ui.auth.testhelpers.TestHelper;
-import com.firebase.ui.auth.util.data.AuthOperationManager;
-import com.firebase.ui.auth.util.data.ProviderUtils;
-import com.firebase.ui.auth.viewmodel.idp.LinkingSocialProviderResponseHandler;
-import com.google.firebase.auth.AuthCredential;
-import com.google.firebase.auth.FacebookAuthProvider;
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseUser;
-import com.google.firebase.auth.GoogleAuthCredential;
-import com.google.firebase.auth.GoogleAuthProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Collections;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Unit tests for {@link LinkingSocialProviderResponseHandler}.
- * <p>
- * This handler is used by WelcomeBackIdpPrompt. This prompt handles the case where a user attempts
- * to log in with an IDP, but there is a user that has a different IDP with the same email.
- * <p>
- * In this case, the handler will link the provider to the existing firebase user. When the user
- * is anonymous, a triple linking case occurs.
- */
-@RunWith(RobolectricTestRunner.class)
-public class LinkingSocialProviderResponseHandlerTest {
-
-    @Mock FirebaseAuth mMockAuth;
-    @Mock FirebaseAuth mScratchMockAuth;
-
-    @Mock FirebaseUser mMockUser;
-    @Mock Observer<Resource<IdpResponse>> mResponseObserver;
-
-    private LinkingSocialProviderResponseHandler mHandler;
-
-
-    @Before
-    public void setUp() {
-        TestHelper.initialize();
-        MockitoAnnotations.initMocks(this);
-
-        mHandler = new LinkingSocialProviderResponseHandler(RuntimeEnvironment.application);
-        FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
-                GoogleAuthProvider.PROVIDER_ID));
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
-    }
-
-    @Test
-    public void testSignIn_withSameIdp_expectSuccess() {
-        mHandler.getOperation().observeForever(mResponseObserver);
-
-        // Fake social response from Google
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .setToken(TestConstants.TOKEN)
-                .build();
-
-        when(mMockAuth.signInWithCredential(any(AuthCredential.class)))
-                .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
-
-        mHandler.startSignIn(response);
-
-        verify(mMockAuth).signInWithCredential(any(GoogleAuthCredential.class));
-
-        InOrder inOrder = inOrder(mResponseObserver);
-        inOrder.verify(mResponseObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-        inOrder.verify(mResponseObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isSuccess()));
-    }
-
-
-    @Test
-    public void testSignIn_anonymousUpgradeEnabledWithSameIdp_expectMergeFailure() {
-        mHandler.getOperation().observeForever(mResponseObserver);
-        setupAnonymousUpgrade();
-
-        // Fake social response from Google
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .setToken(TestConstants.TOKEN)
-                .build();
-
-        mHandler.startSignIn(response);
-
-        // Since we are signing in with the same IDP and anonymous upgrade is enabled, a merge
-        // failure should occur without any RPC calls
-
-        AuthCredential credential = GoogleAuthProvider.getCredential(TestConstants.TOKEN, null);
-
-        InOrder inOrder = inOrder(mResponseObserver);
-        inOrder.verify(mResponseObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-
-        ArgumentCaptor<Resource<IdpResponse>> resolveCaptor =
-                ArgumentCaptor.forClass(Resource.class);
-        inOrder.verify(mResponseObserver).onChanged(resolveCaptor.capture());
-
-        FirebaseAuthAnonymousUpgradeException e =
-                (FirebaseAuthAnonymousUpgradeException) resolveCaptor.getValue().getException();
-
-        GoogleAuthCredential responseCredential =
-                (GoogleAuthCredential) e.getResponse().getCredentialForLinking();
-
-        assertThat(responseCredential.getProvider()).isEqualTo(credential.getProvider());
-        assertThat(responseCredential.getSignInMethod()).isEqualTo(credential.getSignInMethod());
-
-    }
-
-    @Test
-    public void testSignIn_withDifferentIdp_expectSuccess() {
-        mHandler.getOperation().observeForever(mResponseObserver);
-
-        // We're going to fake a sign in with facebook, where the email belongs
-        // to an existing account with a Google provider.
-
-        // Fake social response from Google
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .setToken(TestConstants.TOKEN)
-                .build();
-
-        // Set facebook credential
-        AuthCredential facebookAuthCredential =
-                FacebookAuthProvider.getCredential(TestConstants.TOKEN);
-        mHandler.setRequestedSignInCredentialForEmail(facebookAuthCredential, TestConstants.EMAIL);
-
-
-        // mock sign in with Google credential to always work
-        when(mMockAuth.signInWithCredential(any(GoogleAuthCredential.class)))
-                .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
-
-        // Mock linking with Facebook to always work
-        when(FakeAuthResult.INSTANCE.getUser().linkWithCredential(facebookAuthCredential))
-                .thenReturn(new AutoContinueTask<>(FakeAuthResult.INSTANCE,
-                        FakeAuthResult.INSTANCE,
-                        true,
-                        null));
-
-        mHandler.startSignIn(response);
-
-        verify(mMockAuth).signInWithCredential(any(GoogleAuthCredential.class));
-        verify(FakeAuthResult.INSTANCE.getUser()).linkWithCredential(facebookAuthCredential);
-
-        InOrder inOrder = inOrder(mResponseObserver);
-        inOrder.verify(mResponseObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-        inOrder.verify(mResponseObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isSuccess()));
-    }
-
-    @Test
-    public void testSignIn_anonymousUpgradeEnabledWithDifferentIdp_expectMergeFailure() {
-        mHandler.getOperation().observeForever(mResponseObserver);
-        setupAnonymousUpgrade();
-
-        // We're going to fake a sign in with facebook, where the email belongs
-        // to an existing account with a Google provider.
-        // We need to link Facebook to this account, and then a merge failure should occur
-        // so that the developer can handle it.
-        // Before we can link, they need to sign in with Google to prove they own the account.
-
-        // Fake social response from Google
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .setToken(TestConstants.TOKEN)
-                .build();
-
-        // Set facebook credential
-        AuthCredential facebookAuthCredential =
-                FacebookAuthProvider.getCredential(TestConstants.TOKEN);
-        mHandler.setRequestedSignInCredentialForEmail(facebookAuthCredential, TestConstants.EMAIL);
-
-        when(mScratchMockAuth.signInWithCredential(any(GoogleAuthCredential.class)))
-                .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
-
-        // Mock linking with Facebook to always work
-        when(FakeAuthResult.INSTANCE.getUser().linkWithCredential(facebookAuthCredential))
-                .thenReturn(new AutoContinueTask<>(FakeAuthResult.INSTANCE,
-                        FakeAuthResult.INSTANCE,
-                        true,
-                        null));
-
-        mHandler.startSignIn(response);
-
-        verify(mScratchMockAuth).signInWithCredential(any(GoogleAuthCredential.class));
-        verify(FakeAuthResult.INSTANCE.getUser()).linkWithCredential(facebookAuthCredential);
-
-        InOrder inOrder = inOrder(mResponseObserver);
-        inOrder.verify(mResponseObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-
-        ArgumentCaptor<Resource<IdpResponse>> resolveCaptor =
-                ArgumentCaptor.forClass(Resource.class);
-        inOrder.verify(mResponseObserver).onChanged(resolveCaptor.capture());
-
-        // Merge failure should occur after successful linking
-        FirebaseAuthAnonymousUpgradeException e =
-                (FirebaseAuthAnonymousUpgradeException) resolveCaptor.getValue().getException();
-
-        AuthCredential credential = ProviderUtils.getAuthCredential(response);
-        GoogleAuthCredential responseCredential =
-                (GoogleAuthCredential) e.getResponse().getCredentialForLinking();
-
-        assertThat(responseCredential.getProvider()).isEqualTo(credential.getProvider());
-        assertThat(responseCredential.getSignInMethod()).isEqualTo(credential.getSignInMethod());
-
-    }
-
-    private void setupAnonymousUpgrade() {
-        FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
-                GoogleAuthProvider.PROVIDER_ID), true);
-        mHandler.initializeForTesting(testParams, mMockAuth, null, 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
deleted file mode 100644
index dd55f1937..000000000
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.firebase.ui.auth.viewmodel;
-
-
-import android.arch.lifecycle.Observer;
-
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
-import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.data.model.FlowParameters;
-import com.firebase.ui.auth.data.model.Resource;
-import com.firebase.ui.auth.data.model.User;
-import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
-import com.firebase.ui.auth.testhelpers.FakeAuthResult;
-import com.firebase.ui.auth.testhelpers.ResourceMatchers;
-import com.firebase.ui.auth.testhelpers.TestConstants;
-import com.firebase.ui.auth.testhelpers.TestHelper;
-import com.firebase.ui.auth.viewmodel.phone.PhoneProviderResponseHandler;
-import com.google.firebase.auth.AuthResult;
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseAuthUserCollisionException;
-import com.google.firebase.auth.FirebaseUser;
-import com.google.firebase.auth.GoogleAuthCredential;
-import com.google.firebase.auth.PhoneAuthCredential;
-import com.google.firebase.auth.PhoneAuthProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Collections;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Unit tests for {@link PhoneProviderResponseHandler}.
- */
-@RunWith(RobolectricTestRunner.class)
-public class PhoneProviderResponseHandlerTest {
-
-    @Mock FirebaseAuth mMockAuth;
-    @Mock FirebaseUser mMockUser;
-    @Mock PhoneAuthCredential mCredential;
-    @Mock Observer<Resource<IdpResponse>> mResponseObserver;
-
-    private PhoneProviderResponseHandler mHandler;
-
-    @Before
-    public void setUp() {
-        TestHelper.initialize();
-        MockitoAnnotations.initMocks(this);
-
-        mHandler = new PhoneProviderResponseHandler(RuntimeEnvironment.application);
-        FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
-                PhoneAuthProvider.PROVIDER_ID));
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
-    }
-
-    @Test
-    public void testSignIn_withValidCredentialAndNewUser_expectSuccess() {
-        mHandler.getOperation().observeForever(mResponseObserver);
-
-        when(mMockAuth.signInWithCredential(mCredential))
-                .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
-
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                PhoneAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .build();
-
-        mHandler.startSignIn(mCredential, response);
-        verify(mMockAuth).signInWithCredential(mCredential);
-        verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isSuccess()));
-    }
-
-    @Test
-    public void testSignIn_autoUpgradeAnonymousEnabledWithNewUser_expectSuccess() {
-        mHandler.getOperation().observeForever(mResponseObserver);
-        setupAnonymousUpgrade();
-
-        when(mMockAuth.getCurrentUser().linkWithCredential(mCredential))
-                .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
-
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                PhoneAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .build();
-
-        mHandler.startSignIn(mCredential, response);
-
-        verify(mMockAuth.getCurrentUser()).linkWithCredential(mCredential);
-        verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isSuccess()));
-    }
-
-
-    @Test
-    public void testSignIn_autoUpgradeAnonymousEnabledWithExistingUser_expectMergeFailure() {
-        mHandler.getOperation().observeForever(mResponseObserver);
-        setupAnonymousUpgrade();
-
-        when(mMockAuth.getCurrentUser().linkWithCredential(mCredential))
-                .thenReturn(AutoCompleteTask.<AuthResult>forFailure(
-                        new FirebaseAuthUserCollisionException("foo", "bar", mCredential)));
-
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                PhoneAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .build();
-
-        mHandler.startSignIn(mCredential, response);
-
-        verify(mMockAuth.getCurrentUser()).linkWithCredential(mCredential);
-
-        InOrder inOrder = inOrder(mResponseObserver);
-        inOrder.verify(mResponseObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-
-        ArgumentCaptor<Resource<IdpResponse>> resolveCaptor =
-                ArgumentCaptor.forClass(Resource.class);
-        inOrder.verify(mResponseObserver).onChanged(resolveCaptor.capture());
-
-        FirebaseAuthAnonymousUpgradeException e =
-                (FirebaseAuthAnonymousUpgradeException) resolveCaptor.getValue().getException();
-
-        assertThat(e.getResponse().getCredentialForLinking()).isNotNull();
-    }
-
-    private void setupAnonymousUpgrade() {
-        FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
-                PhoneAuthProvider.PROVIDER_ID), true);
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
-        when(mMockAuth.getCurrentUser()).thenReturn(mMockUser);
-        when(mMockUser.isAnonymous()).thenReturn(true);
-    }
-}
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 36bf76bee..e5f1348b6 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
@@ -4,7 +4,6 @@
 import android.arch.lifecycle.Observer;
 
 import com.firebase.ui.auth.AuthUI;
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.IntentRequiredException;
@@ -16,8 +15,6 @@
 import com.firebase.ui.auth.testhelpers.ResourceMatchers;
 import com.firebase.ui.auth.testhelpers.TestConstants;
 import com.firebase.ui.auth.testhelpers.TestHelper;
-import com.firebase.ui.auth.ui.email.WelcomeBackPasswordPrompt;
-import com.firebase.ui.auth.ui.idp.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.viewmodel.idp.SocialProviderResponseHandler;
 import com.firebase.ui.auth.viewmodel.smartlock.SmartLockHandler;
 import com.google.firebase.auth.AuthCredential;
@@ -26,9 +23,9 @@
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
-import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.SignInMethodQueryResult;
+import com.google.firebase.auth.UserProfileChangeRequest;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,10 +37,8 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-import java.util.Arrays;
 import java.util.Collections;
 
-import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.inOrder;
@@ -56,7 +51,6 @@
 @RunWith(RobolectricTestRunner.class)
 public class SocialProviderResponseHandlerTest {
     @Mock FirebaseAuth mMockAuth;
-    @Mock FirebaseUser mUser;
     @Mock Observer<Resource<IdpResponse>> mResultObserver;
 
     private SocialProviderResponseHandler mHandler;
@@ -79,6 +73,8 @@ public void testSignInIdp_success() {
 
         when(mMockAuth.signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
+        when(FakeAuthResult.INSTANCE.getUser().updateProfile(any(UserProfileChangeRequest.class)))
+                .thenReturn(AutoCompleteTask.<Void>forSuccess(null));
 
         IdpResponse response = new IdpResponse.Builder(new User.Builder(
                 GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
@@ -87,9 +83,8 @@ public void testSignInIdp_success() {
 
         mHandler.startSignIn(response);
 
-        verify(mMockAuth).signInWithCredential(any(AuthCredential.class));
-
         InOrder inOrder = inOrder(mResultObserver);
+
         inOrder.verify(mResultObserver)
                 .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
         inOrder.verify(mResultObserver)
@@ -137,10 +132,8 @@ public void testSignInIdp_resolution() {
 
         mHandler.startSignIn(response);
 
-        verify(mMockAuth).signInWithCredential(any(AuthCredential.class));
-        verify(mMockAuth).fetchSignInMethodsForEmail(any(String.class));
-
         InOrder inOrder = inOrder(mResultObserver);
+
         inOrder.verify(mResultObserver)
                 .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
 
@@ -157,166 +150,4 @@ public void testSignInIdp_resolution() {
         inOrder.verify(mResultObserver)
                 .onChanged(argThat(ResourceMatchers.<IdpResponse>isSuccess()));
     }
-
-
-    @Test
-    public void testSignInIdp_anonymousUserUpgradeEnabledAndNewUser_expectSuccess() {
-        mHandler.getOperation().observeForever(mResultObserver);
-        setupAnonymousUpgrade();
-
-        when(mMockAuth.getCurrentUser().linkWithCredential(any(AuthCredential.class)))
-                .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
-
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .setToken(TestConstants.TOKEN)
-                .build();
-
-        mHandler.startSignIn(response);
-
-        verify(mMockAuth.getCurrentUser()).linkWithCredential(any(AuthCredential.class));
-
-        InOrder inOrder = inOrder(mResultObserver);
-        inOrder.verify(mResultObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-        inOrder.verify(mResultObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isSuccess()));
-    }
-
-    @Test
-    public void testSignInIdp_anonymousUserUpgradeEnabledAndExistingUserWithSameIdp_expectMergeFailure() {
-        mHandler.getOperation().observeForever(mResultObserver);
-        setupAnonymousUpgrade();
-
-        when(mMockAuth.getCurrentUser().linkWithCredential(any(AuthCredential.class)))
-                .thenReturn(AutoCompleteTask.<AuthResult>forFailure(
-                        new FirebaseAuthUserCollisionException("foo", "bar")));
-
-        // Case 1: Anon user signing in with a Google credential that belongs to an existing user.
-        when(mMockAuth.fetchSignInMethodsForEmail(any(String.class)))
-                .thenReturn(AutoCompleteTask.<SignInMethodQueryResult>forSuccess(
-                        new FakeSignInMethodQueryResult(Arrays.asList(
-                                GoogleAuthProvider.GOOGLE_SIGN_IN_METHOD,
-                                FacebookAuthProvider.FACEBOOK_SIGN_IN_METHOD))));
-
-
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .setToken(TestConstants.TOKEN)
-                .build();
-
-        mHandler.startSignIn(response);
-
-        verify(mMockAuth.getCurrentUser()).linkWithCredential(any(AuthCredential.class));
-
-        InOrder inOrder = inOrder(mResultObserver);
-        inOrder.verify(mResultObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-
-        ArgumentCaptor<Resource<IdpResponse>> resolveCaptor =
-                ArgumentCaptor.forClass(Resource.class);
-        inOrder.verify(mResultObserver).onChanged(resolveCaptor.capture());
-
-        FirebaseAuthAnonymousUpgradeException e =
-                (FirebaseAuthAnonymousUpgradeException) resolveCaptor.getValue().getException();
-
-        assertThat(e.getResponse().getCredentialForLinking()).isNotNull();
-    }
-
-    @Test
-    public void testSignInIdp_anonymousUserUpgradeEnabledAndExistingIdpUserWithDifferentIdp_expectMergeFailure() {
-        mHandler.getOperation().observeForever(mResultObserver);
-        setupAnonymousUpgrade();
-
-        when(mMockAuth.getCurrentUser().linkWithCredential(any(AuthCredential.class)))
-                .thenReturn(AutoCompleteTask.<AuthResult>forFailure(
-                        new FirebaseAuthUserCollisionException("foo", "bar")));
-
-        // Case 2 & 3: trying to link with an account that has 1 idp, which is different from the
-        // one that we're trying to log in with
-        when(mMockAuth.fetchSignInMethodsForEmail(any(String.class)))
-                .thenReturn(AutoCompleteTask.<SignInMethodQueryResult>forSuccess(
-                        new FakeSignInMethodQueryResult(Collections.singletonList(
-                                FacebookAuthProvider.FACEBOOK_SIGN_IN_METHOD))));
-
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .setToken(TestConstants.TOKEN)
-                .build();
-
-        mHandler.startSignIn(response);
-
-        verify(mMockAuth.getCurrentUser()).linkWithCredential(any(AuthCredential.class));
-
-        InOrder inOrder = inOrder(mResultObserver);
-        inOrder.verify(mResultObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-
-        ArgumentCaptor<Resource<IdpResponse>> resolveCaptor =
-                ArgumentCaptor.forClass(Resource.class);
-        inOrder.verify(mResultObserver).onChanged(resolveCaptor.capture());
-
-        // Make sure that we are trying to start the WelcomeBackIdpPrompt activity
-        IntentRequiredException e =
-                ((IntentRequiredException) resolveCaptor.getValue().getException());
-        assertThat(e.getIntent().getComponent().getClassName())
-                .isEqualTo(WelcomeBackIdpPrompt.class.toString().split(" ")[1]);
-
-        assertThat(IdpResponse.fromResultIntent(e.getIntent())).isEqualTo(response);
-
-    }
-
-    @Test
-    public void testSignInIdp_anonymousUserUpgradeEnabledAndExistingPasswordUserWithDifferentIdp_expectMergeFailure() {
-        mHandler.getOperation().observeForever(mResultObserver);
-        setupAnonymousUpgrade();
-
-        when(mMockAuth.getCurrentUser().linkWithCredential(any(AuthCredential.class)))
-                .thenReturn(AutoCompleteTask.<AuthResult>forFailure(
-                        new FirebaseAuthUserCollisionException("foo", "bar")));
-
-        // Case 2 & 3: trying to link with an account that has 1 password provider and logging in
-        // with an idp that has the same email
-        when(mMockAuth.fetchSignInMethodsForEmail(any(String.class)))
-                .thenReturn(AutoCompleteTask.<SignInMethodQueryResult>forSuccess(
-                        new FakeSignInMethodQueryResult(Collections.singletonList(
-                                EmailAuthProvider.EMAIL_PASSWORD_SIGN_IN_METHOD))));
-
-        IdpResponse response = new IdpResponse.Builder(new User.Builder(
-                FacebookAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
-                .setToken(TestConstants.TOKEN)
-                .setSecret(TestConstants.SECRET)
-                .build();
-
-        mHandler.startSignIn(response);
-
-        verify(mMockAuth.getCurrentUser()).linkWithCredential(any(AuthCredential.class));
-
-        InOrder inOrder = inOrder(mResultObserver);
-        inOrder.verify(mResultObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-
-        ArgumentCaptor<Resource<IdpResponse>> resolveCaptor =
-                ArgumentCaptor.forClass(Resource.class);
-        inOrder.verify(mResultObserver).onChanged(resolveCaptor.capture());
-
-        // Make sure that we are trying to start the WelcomeBackIdpPrompt activity
-        IntentRequiredException e =
-                ((IntentRequiredException) resolveCaptor.getValue().getException());
-        assertThat(e.getIntent().getComponent().getClassName())
-                .isEqualTo(WelcomeBackPasswordPrompt.class.toString().split(" ")[1]);
-
-        assertThat(IdpResponse.fromResultIntent(e.getIntent())).isEqualTo(response);
-    }
-
-    private void setupAnonymousUpgrade() {
-        // enableAnonymousUpgrade must be set to true
-        FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
-                EmailAuthProvider.PROVIDER_ID), /* enableAnonymousUpgrade */ true);
-        mHandler.initializeForTesting(testParams, mMockAuth, null, 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 d584babd4..40f2b8a3c 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
@@ -2,7 +2,6 @@
 
 import android.arch.lifecycle.Observer;
 
-import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.Resource;
@@ -13,23 +12,18 @@
 import com.firebase.ui.auth.testhelpers.ResourceMatchers;
 import com.firebase.ui.auth.testhelpers.TestConstants;
 import com.firebase.ui.auth.testhelpers.TestHelper;
-import com.firebase.ui.auth.util.data.AuthOperationManager;
 import com.firebase.ui.auth.viewmodel.email.WelcomeBackPasswordHandler;
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.auth.api.credentials.CredentialsClient;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
-import com.google.firebase.auth.EmailAuthCredential;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseUser;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -37,10 +31,8 @@
 
 import java.util.Collections;
 
-import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -51,9 +43,8 @@
 public class WelcomeBackPasswordHandlerTest {
 
     @Mock FirebaseAuth mMockAuth;
-    @Mock FirebaseAuth mScratchMockAuth;
-    @Mock FirebaseUser mUser;
     @Mock CredentialsClient mMockCredentials;
+
     @Mock Observer<Resource<IdpResponse>> mResponseObserver;
 
     private WelcomeBackPasswordHandler mHandler;
@@ -138,117 +129,4 @@ public void testSignIn_propagatesFailure() {
         // Verify that we get a failure event
         verify(mResponseObserver).onChanged(argThat(ResourceMatchers.<IdpResponse>isFailure()));
     }
-
-    @Test
-    public void testSignIn_anonymousUserUpgradeEnabledWithEmailFlow_expectValidateCredentialAndMergeFailure() {
-        setupAnonymousUpgrade();
-        mHandler.getOperation().observeForever(mResponseObserver);
-
-        // Fake user with password provider
-        User user = new User.Builder(EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL)
-                .build();
-        IdpResponse response = new IdpResponse.Builder(user)
-                .build();
-
-        // Need to control FirebaseAuth's return values
-        AuthOperationManager authOperationManager = AuthOperationManager.getInstance();
-        authOperationManager.mScratchAuth = mScratchMockAuth;
-
-        when(mScratchMockAuth.signInWithCredential(any(AuthCredential.class)))
-                .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
-
-        // Kick off the sign in flow
-        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, response, null);
-
-        // Verify that signInWithCredential was called
-        ArgumentCaptor<EmailAuthCredential> credentialCaptor
-                = ArgumentCaptor.forClass(EmailAuthCredential.class);
-        verify(mScratchMockAuth).signInWithCredential(credentialCaptor.capture());
-
-        EmailAuthCredential capturedCredential = credentialCaptor.getValue();
-        assertThat(capturedCredential.getEmail()).isEqualTo(TestConstants.EMAIL);
-        assertThat(capturedCredential.getPassword()).isEqualTo(TestConstants.PASSWORD);
-
-        verifyMergeFailure();
-    }
-
-    @Test
-    public void testSignIn_anonymousUserUpgradeEnabledWithSocialFlow_expectSafeLinksIdpCredentialAndMergeFailure() {
-        setupAnonymousUpgrade();
-
-        mHandler.getOperation().observeForever(mResponseObserver);
-
-        // Fake social response from Facebook
-        User user = new User.Builder(FacebookAuthProvider.PROVIDER_ID, TestConstants.EMAIL)
-                .build();
-
-        IdpResponse response = new IdpResponse.Builder(user)
-                .setToken(TestConstants.TOKEN)
-                .setSecret(TestConstants.SECRET)
-                .build();
-
-        AuthCredential credential = FacebookAuthProvider.getCredential(TestConstants.TOKEN);
-
-        // Need to control FirebaseAuth's return values
-        AuthOperationManager authOperationManager = AuthOperationManager.getInstance();
-        authOperationManager.mScratchAuth = mScratchMockAuth;
-
-        when(mScratchMockAuth.signInWithCredential(any(AuthCredential.class)))
-                .thenReturn(AutoCompleteTask.forSuccess(FakeAuthResult.INSTANCE));
-
-        // Mock linking with Facebook to always work
-        when(FakeAuthResult.INSTANCE.getUser().linkWithCredential(credential))
-                .thenReturn(new AutoContinueTask<>(FakeAuthResult.INSTANCE,
-                        FakeAuthResult.INSTANCE,
-                        true,
-                        null));
-
-        // Kick off the sign in flow
-        mHandler.startSignIn(TestConstants.EMAIL, TestConstants.PASSWORD, response, credential);
-
-        // Verify that signInWithCredential was called
-        ArgumentCaptor<EmailAuthCredential> credentialCaptor
-                = ArgumentCaptor.forClass(EmailAuthCredential.class);
-        verify(mScratchMockAuth).signInWithCredential(credentialCaptor.capture());
-
-        EmailAuthCredential capturedCredential = credentialCaptor.getValue();
-        assertThat(capturedCredential.getEmail()).isEqualTo(TestConstants.EMAIL);
-        assertThat(capturedCredential.getPassword()).isEqualTo(TestConstants.PASSWORD);
-
-        // Verify that account linking is attempted
-        verify(FakeAuthResult.INSTANCE.getUser()).linkWithCredential(credential);
-
-        verifyMergeFailure();
-    }
-
-    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);
-
-        // Mock isAnonymous() to return true so canUpgradeAnonymous will return true
-        when(mUser.isAnonymous()).thenReturn(true);
-        when(mMockAuth.getCurrentUser()).thenReturn(mUser);
-    }
-
-    private void verifyMergeFailure() {
-        InOrder inOrder = inOrder(mResponseObserver);
-
-        inOrder.verify(mResponseObserver)
-                .onChanged(argThat(ResourceMatchers.<IdpResponse>isLoading()));
-
-        ArgumentCaptor<Resource<IdpResponse>> resolveCaptor =
-                ArgumentCaptor.forClass(Resource.class);
-        inOrder.verify(mResponseObserver).onChanged(resolveCaptor.capture());
-
-        FirebaseAuthAnonymousUpgradeException e =
-                ((FirebaseAuthAnonymousUpgradeException) resolveCaptor.getValue().getException());
-
-        EmailAuthCredential responseCredential =
-                (EmailAuthCredential) e.getResponse().getCredentialForLinking();
-
-        assertThat(responseCredential.getEmail()).isEqualTo(TestConstants.EMAIL);
-        assertThat(responseCredential.getPassword()).isEqualTo(TestConstants.PASSWORD);
-    }
 }
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 328093545..64eb93e1d 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -91,7 +91,6 @@ object Config {
 
         object Test {
             const val junit = "junit:junit:4.12"
-            const val truth = "com.google.truth:truth:0.40"
             const val mockito = "org.mockito:mockito-android:2.18.3"
             const val robolectric = "org.robolectric:robolectric:3.8"
 

From e0fe13025ea5075603e9d60d370c034c55a92149 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Sat, 4 Aug 2018 20:39:46 -0700
Subject: [PATCH 27/28] Fix merge mistakes

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
---
 auth/build.gradle.kts              | 1 +
 buildSrc/src/main/kotlin/Config.kt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 7ede7b2bf..3df0ecc63 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -42,6 +42,7 @@ dependencies {
     implementation(Config.Libs.Misc.retrofitGson)
 
     testImplementation(Config.Libs.Test.junit)
+    testImplementation(Config.Libs.Test.truth)
     testImplementation(Config.Libs.Test.mockito)
     testImplementation(Config.Libs.Test.robolectric)
     testImplementation(Config.Libs.Provider.facebook)
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 64eb93e1d..328093545 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -91,6 +91,7 @@ object Config {
 
         object Test {
             const val junit = "junit:junit:4.12"
+            const val truth = "com.google.truth:truth:0.40"
             const val mockito = "org.mockito:mockito-android:2.18.3"
             const val robolectric = "org.robolectric:robolectric:3.8"
 

From c387047a61398da3da93b90517505379b3d9c76b Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Mon, 6 Aug 2018 08:46:51 -0700
Subject: [PATCH 28/28] Fix GitHub provider NPE when no perms are supplied
 (#1405)

---
 .../ui/auth/data/remote/GitHubSignInHandler.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/GitHubSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/GitHubSignInHandler.java
index 8498f5b49..20992bc77 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/GitHubSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/GitHubSignInHandler.java
@@ -80,8 +80,15 @@ private static IdpResponse createIdpResponse(
 
     @Override
     protected void onCreate() {
-        List<String> permissions = new ArrayList<>(getArguments().getParams()
-                .getStringArrayList(ExtraConstants.GITHUB_PERMISSIONS));
+        List<String> permissions = getArguments().getParams()
+                .getStringArrayList(ExtraConstants.GITHUB_PERMISSIONS);
+
+        if (permissions == null) {
+            permissions = new ArrayList<>();
+        } else {
+            permissions = new ArrayList<>(permissions);
+        }
+
         if (!permissions.contains(EMAIL_PERMISSION)) {
             permissions.add(EMAIL_PERMISSION);
         }