mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Default discard/delete

This commit is contained in:
M66B 2021-09-13 07:19:54 +02:00
parent a13c296f1a
commit 0761fbfc8a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/ApplicationEx.java
View File

@ -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)

2
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -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);

2
app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
View File

@ -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));