From 6e70fb0c4a42da5337bcd0b2e81b8324c4e544fe Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 7 Jan 2023 19:28:54 +0100 Subject: [PATCH] Default disable auto reply plain text only --- app/src/main/java/eu/faircode/email/ApplicationEx.java | 3 +++ app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- app/src/main/java/eu/faircode/email/FragmentOptionsSend.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index a5c0d0af77..36286eda75 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -672,6 +672,9 @@ public class ApplicationEx extends Application } else if (version < 2016) { if (!prefs.contains("reset_snooze")) editor.putBoolean("reset_snooze", false); + } else if (version < 2029) { + if (!prefs.contains("plain_only_reply")) + editor.putBoolean("plain_only_reply", true); } 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 a56b7b7c11..4a5e8f00e9 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -4630,7 +4630,7 @@ public class FragmentCompose extends FragmentBase { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); boolean plain_only = prefs.getBoolean("plain_only", false); - boolean plain_only_reply = prefs.getBoolean("plain_only_reply", true); + boolean plain_only_reply = prefs.getBoolean("plain_only_reply", false); boolean resize_reply = prefs.getBoolean("resize_reply", true); boolean sign_default = prefs.getBoolean("sign_default", false); boolean encrypt_default = prefs.getBoolean("encrypt_default", false); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java index 646a6a1024..3d36b134c4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java @@ -772,7 +772,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc swAttachNew.setChecked(prefs.getBoolean("attach_new", true)); swAutoLink.setChecked(prefs.getBoolean("auto_link", false)); swPlainOnly.setChecked(prefs.getBoolean("plain_only", false)); - swPlainOnlyReply.setChecked(prefs.getBoolean("plain_only_reply", true)); + swPlainOnlyReply.setChecked(prefs.getBoolean("plain_only_reply", false)); swFormatFlowed.setChecked(prefs.getBoolean("format_flowed", false)); swUsenetSignature.setChecked(prefs.getBoolean("usenet_signature", false)); swRemoveSignatures.setChecked(prefs.getBoolean("remove_signatures", false));