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

Conditionally reply signed/encrypted

Browse Source
pull/183/head
M66B 5 years ago
parent 4551342937
commit d2144403be
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File

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

@ -3418,12 +3418,14 @@ public class FragmentCompose extends FragmentBase {
data.draft.plain_only = true; data.draft.plain_only = true;
// Encryption // Encryption
if (ref.ui_encrypt != null && !EntityMessage.ENCRYPT_NONE.equals(ref.ui_encrypt)) { if (EntityMessage.PGP_SIGNONLY.equals(ref.ui_encrypt) ||
if (ActivityBilling.isPro(context)) EntityMessage.PGP_SIGNENCRYPT.equals(ref.ui_encrypt)) {
if (Helper.isOpenKeychainInstalled(context) || if (Helper.isOpenKeychainInstalled(context) && selected.sign_key != null)
EntityMessage.SMIME_SIGNONLY.equals(ref.encrypt) || data.draft.ui_encrypt = ref.ui_encrypt;
EntityMessage.SMIME_SIGNENCRYPT.equals(ref.encrypt)) } else if (EntityMessage.SMIME_SIGNONLY.equals(ref.ui_encrypt) ||
data.draft.ui_encrypt = ref.ui_encrypt; EntityMessage.SMIME_SIGNENCRYPT.equals(ref.ui_encrypt)) {
if (ActivityBilling.isPro(context) && selected.sign_key_alias != null)
data.draft.ui_encrypt = ref.ui_encrypt;
} }
// Reply template // Reply template

Write Preview
Loading…
Cancel
Save