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

Fixed global sign/encrypt default when changing identity

This commit is contained in:
M66B 2022-04-16 19:30:29 +02:00
parent 801a0e8817
commit 67d5cb97e3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6689,6 +6689,10 @@ public class FragmentCompose extends FragmentBase {
long id = args.getLong("id");
long iid = args.getLong("identity");
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean sign_default = prefs.getBoolean("sign_default", false);
boolean encrypt_default = prefs.getBoolean("encrypt_default", false);
DB db = DB.getInstance(context);
EntityMessage draft = db.message().getMessage(id);
@ -6699,9 +6703,9 @@ public class FragmentCompose extends FragmentBase {
if (identity == null)
return draft.ui_encrypt;
if (identity.encrypt_default)
if (encrypt_default || identity.encrypt_default)
draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT;
else if (identity.sign_default)
else if (sign_default || identity.sign_default)
draft.ui_encrypt = EntityMessage.PGP_SIGNONLY;
else
draft.ui_encrypt = null;