From 78771e3bbfe7060c88472fc79c2f5da5df88b0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Fri, 24 Apr 2020 21:26:30 -0400 Subject: [PATCH] account summary: avoid crash on dialog dismiss Change-Id: I4bfe702d36da30a5799518814fe3f052934e4e4d --- .../java/cx/ring/account/AccountWizardActivity.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/ring-android/app/src/main/java/cx/ring/account/AccountWizardActivity.java b/ring-android/app/src/main/java/cx/ring/account/AccountWizardActivity.java index fee2779c9..eb4cc5087 100644 --- a/ring-android/app/src/main/java/cx/ring/account/AccountWizardActivity.java +++ b/ring-android/app/src/main/java/cx/ring/account/AccountWizardActivity.java @@ -24,7 +24,6 @@ import android.app.Activity; import android.app.ProgressDialog; import android.content.Intent; import android.content.pm.ActivityInfo; -import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; @@ -49,7 +48,6 @@ import cx.ring.model.Account; import cx.ring.model.AccountConfig; import cx.ring.mvp.BaseActivity; import cx.ring.mvp.AccountCreationModel; -import cx.ring.utils.Log; import cx.ring.utils.VCardUtils; import ezvcard.VCard; import io.reactivex.Single; @@ -108,18 +106,13 @@ public class AccountWizardActivity extends BaseActivity<AccountWizardPresenter> mProgress = null; } if (mAlertDialog != null) { + mAlertDialog.setOnDismissListener(null); mAlertDialog.dismiss(); mAlertDialog = null; } super.onDestroy(); } - @Override - public void onConfigurationChanged(Configuration newConfig) { - Log.i(TAG, "onConfigurationChanged " + newConfig); - super.onConfigurationChanged(newConfig); - } - @Override public Single<VCard> saveProfile(final Account account, final AccountCreationModel accountCreationModel) { File filedir = getFilesDir(); @@ -253,9 +246,7 @@ public class AccountWizardActivity extends BaseActivity<AccountWizardPresenter> .setPositiveButton(android.R.string.ok, null) .setTitle(R.string.account_cannot_be_found_title) .setMessage(R.string.account_cannot_be_found_message) - .setOnDismissListener(dialogInterface -> { - getSupportFragmentManager().popBackStack(); - }) + .setOnDismissListener(dialogInterface -> getSupportFragmentManager().popBackStack()) .show(); } -- GitLab