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

Allow default sign if not auto encrypt

This commit is contained in:
M66B 2022-11-02 14:39:27 +01:00
parent 401cbd0792
commit de096500fc
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1576,18 +1576,8 @@ public class FragmentCompose extends FragmentBase {
if (identity == null)
return draft.ui_encrypt;
if (encrypt_default || identity.encrypt_default)
draft.ui_encrypt = (identity.encrypt == 0
? EntityMessage.PGP_SIGNENCRYPT
: EntityMessage.SMIME_SIGNENCRYPT);
else if (sign_default || identity.sign_default)
draft.ui_encrypt = (identity.encrypt == 0
? EntityMessage.PGP_SIGNONLY
: EntityMessage.SMIME_SIGNONLY);
else
if (encrypt_auto) {
draft.ui_encrypt = null;
if (encrypt_auto)
try {
InternetAddress[] to = MessageHelper.parseAddresses(context, args.getString("to"));
InternetAddress[] cc = MessageHelper.parseAddresses(context, args.getString("cc"));
@ -1605,11 +1595,23 @@ public class FragmentCompose extends FragmentBase {
draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT;
else if (identity.encrypt == 1 && SmimeHelper.hasSmimeKey(context, recipients, true))
draft.ui_encrypt = EntityMessage.SMIME_SIGNENCRYPT;
else
draft.ui_encrypt = null;
} catch (Throwable ex) {
Log.w(ex);
}
}
if (!encrypt_auto || draft.ui_encrypt == null) {
if (encrypt_default || identity.encrypt_default)
draft.ui_encrypt = (identity.encrypt == 0
? EntityMessage.PGP_SIGNENCRYPT
: EntityMessage.SMIME_SIGNENCRYPT);
else if (sign_default || identity.sign_default)
draft.ui_encrypt = (identity.encrypt == 0
? EntityMessage.PGP_SIGNONLY
: EntityMessage.SMIME_SIGNONLY);
else
draft.ui_encrypt = null;
}
db.message().setMessageUiEncrypt(draft.id, draft.ui_encrypt);