Skip to content

Commit 6fcf333

Browse files
SUPERCILEXsamtstern
authored andcommitted
Fix dismiss dialog crash (#861)
1 parent c9dc1e8 commit 6fcf333

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -192,36 +192,33 @@ public void run() {
192192
}
193193

194194
private void onVerificationFailed(@NonNull FirebaseException ex) {
195-
VerifyPhoneNumberFragment verifyPhoneNumberFragment = (VerifyPhoneNumberFragment)
196-
getSupportFragmentManager().findFragmentByTag(VerifyPhoneNumberFragment.TAG);
195+
dismissLoadingDialog();
197196

198-
if (verifyPhoneNumberFragment == null) {
199-
return;
200-
}
201197
if (ex instanceof FirebaseAuthException) {
202198
FirebaseAuthError error = FirebaseAuthError.fromException((FirebaseAuthException) ex);
203199

204200
switch (error) {
205201
case ERROR_INVALID_PHONE_NUMBER:
206-
verifyPhoneNumberFragment.showError(getString(R.string.fui_invalid_phone_number));
207-
dismissLoadingDialog();
202+
VerifyPhoneNumberFragment verifyPhoneNumberFragment = (VerifyPhoneNumberFragment)
203+
getSupportFragmentManager().findFragmentByTag(VerifyPhoneNumberFragment.TAG);
204+
205+
if (verifyPhoneNumberFragment != null) {
206+
verifyPhoneNumberFragment.showError(
207+
getString(R.string.fui_invalid_phone_number));
208+
}
208209
break;
209210
case ERROR_TOO_MANY_REQUESTS:
210211
showAlertDialog(getString(R.string.fui_error_too_many_attempts), null);
211-
dismissLoadingDialog();
212212
break;
213213
case ERROR_QUOTA_EXCEEDED:
214214
showAlertDialog(getString(R.string.fui_error_quota_exceeded), null);
215-
dismissLoadingDialog();
216215
break;
217216
default:
218217
Log.w(PHONE_VERIFICATION_LOG_TAG, error.getDescription(), ex);
219-
dismissLoadingDialog();
220218
showAlertDialog(error.getDescription(), null);
221219
}
222220
} else {
223221
Log.w(PHONE_VERIFICATION_LOG_TAG, ex.getLocalizedMessage());
224-
dismissLoadingDialog();
225222
showAlertDialog(ex.getLocalizedMessage(), null);
226223
}
227224
}
@@ -386,7 +383,7 @@ private void showLoadingDialog(String message) {
386383

387384
private void dismissLoadingDialog() {
388385
if (mProgressDialog != null) {
389-
mProgressDialog.dismiss();
386+
mProgressDialog.dismissAllowingStateLoss();
390387
mProgressDialog = null;
391388
}
392389
}

0 commit comments

Comments
 (0)