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

Revert OpenKeychain check

This commit is contained in:
M66B 2022-10-30 17:29:51 +01:00
parent 8b0e5e1c57
commit 0293c52651
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1576,9 +1576,7 @@ public class FragmentCompose extends FragmentBase {
if (identity == null) if (identity == null)
return draft.ui_encrypt; return draft.ui_encrypt;
if (identity.encrypt == 0 && !Helper.isOpenKeychainInstalled(context)) if (encrypt_default || identity.encrypt_default)
draft.ui_encrypt = null;
else if (encrypt_default || identity.encrypt_default)
draft.ui_encrypt = (identity.encrypt == 0 draft.ui_encrypt = (identity.encrypt == 0
? EntityMessage.PGP_SIGNENCRYPT ? EntityMessage.PGP_SIGNENCRYPT
: EntityMessage.SMIME_SIGNENCRYPT); : EntityMessage.SMIME_SIGNENCRYPT);
@ -4960,17 +4958,16 @@ public class FragmentCompose extends FragmentBase {
!"editasnew".equals(action)) !"editasnew".equals(action))
data.draft.plain_only = 1; data.draft.plain_only = 1;
if (selected.encrypt != 0 || Helper.isOpenKeychainInstalled(context)) if (encrypt_default || selected.encrypt_default)
if (encrypt_default || selected.encrypt_default) if (selected.encrypt == 0)
if (selected.encrypt == 0) data.draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT;
data.draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT; else
else data.draft.ui_encrypt = EntityMessage.SMIME_SIGNENCRYPT;
data.draft.ui_encrypt = EntityMessage.SMIME_SIGNENCRYPT; else if (sign_default || selected.sign_default)
else if (sign_default || selected.sign_default) if (selected.encrypt == 0)
if (selected.encrypt == 0) data.draft.ui_encrypt = EntityMessage.PGP_SIGNONLY;
data.draft.ui_encrypt = EntityMessage.PGP_SIGNONLY; else
else data.draft.ui_encrypt = EntityMessage.SMIME_SIGNONLY;
data.draft.ui_encrypt = EntityMessage.SMIME_SIGNONLY;
} }
if (receipt_default) if (receipt_default)