Refactor progress hiding and delegateSignIn()

Author: SUPERCILEX

auth/src/main/java/com/firebase/ui/auth/util/smartlock/SignInDelegate.java

@@ -65,9 +65,7 @@ public class SignInDelegate extends SmartLock<CredentialRequestResult> {
     private AuthUI.AuthUIResult mAuthUIResult;
     private FlowParameters mFlowParams;
     private ProgressDialog mProgressDialog;
-
     private GoogleApiClient mGoogleApiClient;
-    private CredentialRequestResult mCredentialRequestResult;
     private Credential mCredential;
 
     @Override
@@ -82,7 +80,8 @@ public void onCreate(Bundle savedInstance) {
                                                    new DialogInterface.OnCancelListener() {
                                                        @Override
                                                        public void onCancel(DialogInterface dialogInterface) {
-                                                           Log.w(TAG, "playServices:dialog.onCancel()");
+                                                           Log.w(TAG,
+                                                                 "playServices:dialog.onCancel()");
                                                            finish(RESULT_CANCELED, new Intent());
                                                        }
                                                    });
@@ -113,36 +112,36 @@ public void onCancel(DialogInterface dialogInterface) {
 
     @Override
     public void onResult(@NonNull CredentialRequestResult result) {
-        mCredentialRequestResult = result;
         Status status = result.getStatus();
 
         if (status.isSuccess()) {
             // Auto sign-in success
             handleCredential(result.getCredential());
-            delegateSignIn(true);
-        } else if (status.getStatusCode() == CommonStatusCodes.RESOLUTION_REQUIRED) {
-            delegateSignIn(false);
-        }
-    }
-
-    private void delegateSignIn(boolean isAutoSignInAvailable) {
-        String email = getEmailFromCredential();
-        String password = getPasswordFromCredential();
+            String email = getEmailFromCredential();
+            String password = getPasswordFromCredential();
 
-        // Attempt auto-sign in using SmartLock
-        if (isAutoSignInAvailable) {
             if (TextUtils.isEmpty(password)) {
                 // log in with id/provider
                 redirectToIdpSignIn(email, getAccountTypeFromCredential());
             } else {
                 // Sign in with the email/password retrieved from SmartLock
                 signInWithEmailAndPassword(email, password);
             }
-        } else {
-            // resolve credential
-            resolveSavedEmails();
+        } else if (status.getStatusCode() == CommonStatusCodes.RESOLUTION_REQUIRED) {
+            hideProgress();
+            // resolve saved emails
+            try {
+                startIntentSenderForResult(status.getResolution().getIntentSender(),
+                                           RC_CREDENTIALS_READ,
+                                           null,
+                                           0,
+                                           0,
+                                           0,
+                                           null);
+            } catch (IntentSender.SendIntentException e) {
+                Log.e(TAG, "Failed to send Credentials intent.", e);
+            }
         }
-        hideProgress();
     }
 
     @Override
@@ -252,26 +251,6 @@ private void initGoogleApiClient(String accountName) {
         mGoogleApiClient.connect();
     }
 
-    private void resolveSavedEmails() {
-        if (mCredentialRequestResult == null || mCredentialRequestResult.getStatus() == null) {
-            return;
-        }
-        Status status = mCredentialRequestResult.getStatus();
-        if (status.getStatusCode() == CommonStatusCodes.RESOLUTION_REQUIRED) {
-            try {
-                startIntentSenderForResult(status.getResolution().getIntentSender(),
-                                           RC_CREDENTIALS_READ,
-                                           null,
-                                           0,
-                                           0,
-                                           0,
-                                           null);
-            } catch (IntentSender.SendIntentException e) {
-                Log.e(TAG, "Failed to send Credentials intent.", e);
-            }
-        }
-    }
-
     private void startAuthMethodChoice() {
         List<IDPProviderParcel> providers = mFlowParams.providerInfo;
 
@@ -394,6 +373,7 @@ private void finish(int resultCode, Intent data) {
         if (mGoogleApiClient != null) {
             mGoogleApiClient.disconnect();
         }
+        hideProgress();
         mAuthUIResult.onResult(resultCode, data);
         getActivity().getSupportFragmentManager().beginTransaction().remove(this).commit();
     }