From 0761fbfc8ab21e829ebc80b7f60d7a1fe6dc0e72 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 13 Sep 2021 07:19:54 +0200 Subject: [PATCH] Default discard/delete --- app/src/main/java/eu/faircode/email/ApplicationEx.java | 6 +++--- app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- .../main/java/eu/faircode/email/FragmentOptionsSend.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index d8e081b90d..aa04fcdd1e 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -516,9 +516,9 @@ public class ApplicationEx extends Application if (!prefs.contains("landscape3")) editor.putBoolean("landscape3", false); } - } else if (version < 17150) { - editor.remove("sign_algo_smime"); - editor.remove("encrypt_algo_smime"); + } else if (version < 1721) { + if (!prefs.contains("discard_delete")) + editor.putBoolean("discard_delete", false); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 06fcd95b56..35235a8e7a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -5251,7 +5251,7 @@ public class FragmentCompose extends FragmentBase { EntityMessage draft; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - boolean discard_delete = prefs.getBoolean("discard_delete", false); + boolean discard_delete = prefs.getBoolean("discard_delete", true); boolean write_below = prefs.getBoolean("write_below", false); boolean save_drafts = prefs.getBoolean("save_drafts", true); int send_delayed = prefs.getInt("send_delayed", 0); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java index ea59e0d5ad..f291026196 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java @@ -572,7 +572,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc swSignatureNew.setChecked(prefs.getBoolean("signature_new", true)); swSignatureReply.setChecked(prefs.getBoolean("signature_reply", true)); swSignatureForward.setChecked(prefs.getBoolean("signature_forward", true)); - swDiscardDelete.setChecked(prefs.getBoolean("discard_delete", false)); + swDiscardDelete.setChecked(prefs.getBoolean("discard_delete", true)); swReplyMove.setChecked(prefs.getBoolean("reply_move", false)); swAutoLink.setChecked(prefs.getBoolean("auto_link", false));