Merge "Add loading dialogs when signing in"

Aaron Mandle · Gerrit Code Review · commit 7be9db25d3e1 · 2016-05-14T00:20:04.000Z
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java
@@ -99,6 +99,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.welcome_back_idp_button).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                mActivityHelper.showLoadingDialog(R.string.progress_dialog_signing_in);
                 mIdpProvider.startLogin(WelcomeBackIDPPrompt.this, getEmailFromIntent());
             }
         });
@@ -167,12 +168,14 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                                 new OnCompleteListener<AuthResult>() {
                                     @Override
                                     public void onComplete(@NonNull Task<AuthResult> task) {
+                                        mActivityHelper.dismissDialog();
                                         finish(Activity.RESULT_OK, new Intent());
 
                                     }
                                 }
                         );
                     } else {
+                        mActivityHelper.dismissDialog();
                         finish(Activity.RESULT_OK, new Intent());
                     }
                 }
@@ -183,6 +186,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
             authResultTask.addOnCompleteListener(new OnCompleteListener<AuthResult>() {
                 @Override
                 public void onComplete(@NonNull Task<AuthResult> task) {
+                    mActivityHelper.dismissDialog();
                     finish(Activity.RESULT_OK, new Intent());
                 }
             });
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java
@@ -84,8 +84,10 @@ protected void onCreate(Bundle savedInstanceState) {
     public void onClick(View view) {
         int id = view.getId();
         if (id == R.id.button_done) {
+            mActivityHelper.showLoadingDialog(R.string.progress_dialog_signing_in);
             next(mEmail, mPasswordField.getText().toString());
         } else if (id == R.id.trouble_signing_in) {
+            mActivityHelper.dismissDialog();
             startActivity(RecoverPasswordActivity.createIntent(
                     getApplicationContext(),
                     mActivityHelper.flowParams,
@@ -124,7 +126,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                                     if (photoUri != null) {
                                         photoUrl = photoUri.toString();
                                     }
-
+                                    mActivityHelper.dismissDialog();
                                     startActivityForResult(
                                             SaveCredentialsActivity.createIntent(
                                                     mActivityHelper.getApplicationContext(),
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
@@ -115,6 +115,7 @@ private void populateIdpList(List<IDPProviderParcel> providers) {
                 loginButton.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
+                        mActivityHelper.showLoadingDialog(R.string.progress_dialog_loading);
                         provider.startLogin(AuthMethodPickerActivity.this, null);
                     }
                 });
@@ -163,6 +164,7 @@ public void onComplete(
                                             @NonNull Task<ProviderQueryResult> task) {
                                         String provider = task.getResult().getProviders().get(0);
                                         if (provider.equals(EmailAuthProvider.PROVIDER_ID)) {
+                                            mActivityHelper.dismissDialog();
                                             startActivityForResult(
                                                     WelcomeBackPasswordPrompt.createIntent(
                                                             mActivityHelper.getApplicationContext(),
@@ -171,6 +173,7 @@ public void onComplete(
                                                     ), RC_WELCOME_BACK_IDP);
 
                                         } else {
+                                            mActivityHelper.dismissDialog();
                                             startActivityForResult(
                                                     WelcomeBackIDPPrompt.createIntent(
                                                         mActivityHelper.getApplicationContext(),
@@ -190,6 +193,7 @@ public void onComplete(
                             if (photoUri != null) {
                                 photoUrl = photoUri.toString();
                             }
+                            mActivityHelper.dismissDialog();
                             startActivityForResult(SaveCredentialsActivity.createIntent(
                                     mActivityHelper.getApplicationContext(),
                                     mActivityHelper.flowParams,

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ protected void onCreate(Bundle savedInstanceState) {`
`99`	`99`	`findViewById(R.id.welcome_back_idp_button).setOnClickListener(new View.OnClickListener() {`
`100`	`100`	`@Override`
`101`	`101`	`public void onClick(View view) {`
	`102`	`+ mActivityHelper.showLoadingDialog(R.string.progress_dialog_signing_in);`
`102`	`103`	`mIdpProvider.startLogin(WelcomeBackIDPPrompt.this, getEmailFromIntent());`
`103`	`104`	`}`
`104`	`105`	`});`
`@@ -167,12 +168,14 @@ public void onComplete(@NonNull Task<AuthResult> task) {`
`167`	`168`	`new OnCompleteListener<AuthResult>() {`
`168`	`169`	`@Override`
`169`	`170`	`public void onComplete(@NonNull Task<AuthResult> task) {`
	`171`	`+ mActivityHelper.dismissDialog();`
`170`	`172`	`finish(Activity.RESULT_OK, new Intent());`
`171`	`173`
`172`	`174`	`}`
`173`	`175`	`}`
`174`	`176`	`);`
`175`	`177`	`} else {`
	`178`	`+ mActivityHelper.dismissDialog();`
`176`	`179`	`finish(Activity.RESULT_OK, new Intent());`
`177`	`180`	`}`
`178`	`181`	`}`
`@@ -183,6 +186,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {`
`183`	`186`	`authResultTask.addOnCompleteListener(new OnCompleteListener<AuthResult>() {`
`184`	`187`	`@Override`
`185`	`188`	`public void onComplete(@NonNull Task<AuthResult> task) {`
	`189`	`+ mActivityHelper.dismissDialog();`
`186`	`190`	`finish(Activity.RESULT_OK, new Intent());`
`187`	`191`	`}`
`188`	`192`	`});`