Don't show sign-in suggestions before picker activity (#1121)

firebase · Jan 23, 2018 · 92cc7ca · 92cc7ca
1 parent 7e3d057
commit 92cc7ca
Showing 1 changed file with 7 additions and 6 deletions.
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
@@ -29,6 +29,7 @@
 import com.google.android.gms.auth.api.credentials.CredentialRequestResponse;
 import com.google.android.gms.auth.api.credentials.CredentialsClient;
 import com.google.android.gms.auth.api.credentials.IdentityProviders;
+import com.google.android.gms.common.api.CommonStatusCodes;
 import com.google.android.gms.common.api.ResolvableApiException;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
@@ -121,7 +122,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);
@@ -134,19 +135,19 @@ public void onComplete(@NonNull Task<CredentialRequestResponse> task) {
             // Auto sign-in success
             handleCredential(task.getResult().getCredential());
             return;
-        } else {
-            if (task.getException() instanceof ResolvableApiException) {
-                ResolvableApiException rae = (ResolvableApiException) task.getException();
+        } else if (task.getException() instanceof ResolvableApiException) {
+            ResolvableApiException rae = (ResolvableApiException) task.getException();
+            if (rae.getStatusCode() == CommonStatusCodes.RESOLUTION_REQUIRED) {
                 try {
                     startIntentSenderForResult(rae.getResolution().getIntentSender(),
                             RC_CREDENTIALS_READ);
                     return;
                 } catch (IntentSender.SendIntentException e) {
                     Log.e(TAG, "Failed to send Credentials intent.", e);
                 }
-            } else {
-                Log.e(TAG, "Non-resolvable exception:\n" + task.getException());
             }
+        } else {
+            Log.e(TAG, "Non-resolvable exception:\n" + task.getException());
         }
         startAuthMethodChoice();
     }