msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Prevent enabling PGP sign/encrypt without OpenKeychain app

Browse Source
pull/209/head
M66B 2 years ago
parent 7a6a43818d
commit aa8c674a5f
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File

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

@ -4856,16 +4856,17 @@ public class FragmentCompose extends FragmentBase {
!"editasnew".equals(action)) !"editasnew".equals(action))
data.draft.plain_only = 1; data.draft.plain_only = 1;
if (encrypt_default || selected.encrypt_default) if (selected.encrypt != 0 || Helper.isOpenKeychainInstalled(context))
if (selected.encrypt == 0) if (encrypt_default || selected.encrypt_default)
data.draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT; if (selected.encrypt == 0)
else data.draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT;
data.draft.ui_encrypt = EntityMessage.SMIME_SIGNENCRYPT; else
else if (sign_default || selected.sign_default) data.draft.ui_encrypt = EntityMessage.SMIME_SIGNENCRYPT;
if (selected.encrypt == 0) else if (sign_default || selected.sign_default)
data.draft.ui_encrypt = EntityMessage.PGP_SIGNONLY; if (selected.encrypt == 0)
else data.draft.ui_encrypt = EntityMessage.PGP_SIGNONLY;
data.draft.ui_encrypt = EntityMessage.SMIME_SIGNONLY; else
data.draft.ui_encrypt = EntityMessage.SMIME_SIGNONLY;
} }
if (receipt_default) if (receipt_default)
@ -7232,25 +7233,19 @@ public class FragmentCompose extends FragmentBase {
if (identity == null) if (identity == null)
return draft.ui_encrypt; return draft.ui_encrypt;
if (encrypt_default || identity.encrypt_default) if (identity.encrypt == 0 && !Helper.isOpenKeychainInstalled(context))
draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT; draft.ui_encrypt = null;
else 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) else if (sign_default || identity.sign_default)
draft.ui_encrypt = EntityMessage.PGP_SIGNONLY; draft.ui_encrypt = (identity.encrypt == 0
? EntityMessage.PGP_SIGNONLY
: EntityMessage.SMIME_SIGNONLY);
else else
draft.ui_encrypt = null; draft.ui_encrypt = null;
if (identity.encrypt == 0) {
if (EntityMessage.SMIME_SIGNONLY.equals(draft.ui_encrypt))
draft.ui_encrypt = EntityMessage.PGP_SIGNONLY;
else if (EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt))
draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT;
} else {
if (EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt))
draft.ui_encrypt = EntityMessage.SMIME_SIGNONLY;
else if (EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt))
draft.ui_encrypt = EntityMessage.SMIME_SIGNENCRYPT;
}
db.message().setMessageUiEncrypt(draft.id, draft.ui_encrypt); db.message().setMessageUiEncrypt(draft.id, draft.ui_encrypt);
return draft.ui_encrypt; return draft.ui_encrypt;

Write Preview
Loading…
Cancel
Save