Commit d4a61168 authored by Nastuzzi Samy's avatar Nastuzzi Samy
Browse files

Merge branch 'hotfix/dialog'

parents b50dd3f1 6b3be154
......@@ -75,6 +75,13 @@ public abstract class BaseActivity extends NFCActivity {
dialog = new Dialog(this);
}
@Override
protected void onDestroy() {
super.onDestroy();
dialog.dismiss();
}
protected void disconnect() {
nemopaySession.disconnect();
casConnexion.disconnect();
......
......@@ -83,9 +83,8 @@ public class Dialog {
this.alertDialogBuilder
.setTitle(title)
.setMessage(message)
.setCancelable(true)
.setNegativeButton(R.string.ok, onClickListener)
.setOnDismissListener((DialogInterface.OnDismissListener) onClickListener);
.setCancelable(false)
.setNegativeButton(R.string.ok, onClickListener);
createDialog();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment