From 44d7ffc54a805a6163db509936bfd1aa92078ab5 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 4 Jan 2019 17:15:34 +0000 Subject: [PATCH] Do not ask again on OK only --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 9 ++------- .../main/java/eu/faircode/email/FragmentMessages.java | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index b04911cf2e..8599f1452f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -310,17 +310,12 @@ public class FragmentCompose extends FragmentEx { .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - onAction(action); - } - }) - .setNegativeButton(android.R.string.cancel, null) - .setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { if (cbNotAgain.isChecked()) prefs.edit().putBoolean("autosend", true).apply(); + onAction(action); } }) + .setNegativeButton(android.R.string.cancel, null) .show(); } catch (Throwable ex) { onAction(action); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index b17603806e..48bd386b93 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1964,17 +1964,12 @@ public class FragmentMessages extends FragmentEx { .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - moveAskConfirmed(result); - } - }) - .setNegativeButton(android.R.string.cancel, null) - .setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { if (cbNotAgain.isChecked()) prefs.edit().putBoolean("automove", true).apply(); + moveAskConfirmed(result); } }) + .setNegativeButton(android.R.string.cancel, null) .show(); }