Skip to content
Snippets Groups Projects
Commit 78771e3b authored by Adrien Béraud's avatar Adrien Béraud
Browse files

account summary: avoid crash on dialog dismiss

Change-Id: I4bfe702d36da30a5799518814fe3f052934e4e4d
parent a6004c19
No related branches found
No related tags found
No related merge requests found
...@@ -24,7 +24,6 @@ import android.app.Activity; ...@@ -24,7 +24,6 @@ import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
...@@ -49,7 +48,6 @@ import cx.ring.model.Account; ...@@ -49,7 +48,6 @@ import cx.ring.model.Account;
import cx.ring.model.AccountConfig; import cx.ring.model.AccountConfig;
import cx.ring.mvp.BaseActivity; import cx.ring.mvp.BaseActivity;
import cx.ring.mvp.AccountCreationModel; import cx.ring.mvp.AccountCreationModel;
import cx.ring.utils.Log;
import cx.ring.utils.VCardUtils; import cx.ring.utils.VCardUtils;
import ezvcard.VCard; import ezvcard.VCard;
import io.reactivex.Single; import io.reactivex.Single;
...@@ -108,18 +106,13 @@ public class AccountWizardActivity extends BaseActivity<AccountWizardPresenter> ...@@ -108,18 +106,13 @@ public class AccountWizardActivity extends BaseActivity<AccountWizardPresenter>
mProgress = null; mProgress = null;
} }
if (mAlertDialog != null) { if (mAlertDialog != null) {
mAlertDialog.setOnDismissListener(null);
mAlertDialog.dismiss(); mAlertDialog.dismiss();
mAlertDialog = null; mAlertDialog = null;
} }
super.onDestroy(); super.onDestroy();
} }
@Override
public void onConfigurationChanged(Configuration newConfig) {
Log.i(TAG, "onConfigurationChanged " + newConfig);
super.onConfigurationChanged(newConfig);
}
@Override @Override
public Single<VCard> saveProfile(final Account account, final AccountCreationModel accountCreationModel) { public Single<VCard> saveProfile(final Account account, final AccountCreationModel accountCreationModel) {
File filedir = getFilesDir(); File filedir = getFilesDir();
...@@ -253,9 +246,7 @@ public class AccountWizardActivity extends BaseActivity<AccountWizardPresenter> ...@@ -253,9 +246,7 @@ public class AccountWizardActivity extends BaseActivity<AccountWizardPresenter>
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)
.setTitle(R.string.account_cannot_be_found_title) .setTitle(R.string.account_cannot_be_found_title)
.setMessage(R.string.account_cannot_be_found_message) .setMessage(R.string.account_cannot_be_found_message)
.setOnDismissListener(dialogInterface -> { .setOnDismissListener(dialogInterface -> getSupportFragmentManager().popBackStack())
getSupportFragmentManager().popBackStack();
})
.show(); .show();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment