Do not ask again on OK only

6 years ago · 44d7ffc54a
parent 0c95bc75ac
commit 44d7ffc54a
2 changed files with 4 additions and 14 deletions
--- 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);
--- 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();
    }