fixes

Author: Lyokone

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

@@ -281,12 +281,7 @@ public Task<Void> signOut(@NonNull Context context) {
             Log.w(TAG, "Google Play services not available during signOut");
         }
 
-        Task<Void> maybeDisableAutoSignIn = Tasks.forResult((Void) null);
-
-        return Tasks.whenAll(
-                signOutIdps(context),
-                maybeDisableAutoSignIn
-        ).continueWith(task -> {
+        return signOutIdps(context).continueWith(task -> {
             task.getResult(); // Propagate exceptions if any.
             mAuth.signOut();
             return null;

auth/src/main/java/com/firebase/ui/auth/data/remote/SignInKickstarter.java

@@ -56,6 +56,13 @@ public SignInKickstarter(Application application) {
     }
 
     public void start() {
+        if (!TextUtils.isEmpty(getArguments().emailLink)) {
+            setResult(Resource.forFailure(new IntentRequiredException(
+                    EmailLinkCatcherActivity.createIntent(getApplication(), getArguments()),
+                    RequestCodes.EMAIL_FLOW)));
+            return;
+        }
+        
         startAuthMethodChoice();
     }