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

Debug: cleanup

Browse Source
pull/214/head
M66B 7 months ago
parent 08f09b577b
commit 570cf61d82
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -5809,20 +5809,19 @@ public class FragmentCompose extends FragmentBase {
// Encryption // Encryption
List<Address> recipients = data.draft.getAllRecipients(); List<Address> recipients = data.draft.getAllRecipients();
if (!BuildConfig.DEBUG) if (EntityMessage.PGP_SIGNONLY.equals(ref.ui_encrypt) ||
if (EntityMessage.PGP_SIGNONLY.equals(ref.ui_encrypt) || EntityMessage.PGP_SIGNENCRYPT.equals(ref.ui_encrypt)) {
EntityMessage.PGP_SIGNENCRYPT.equals(ref.ui_encrypt)) { if (PgpHelper.isOpenKeychainInstalled(context) &&
if (PgpHelper.isOpenKeychainInstalled(context) && selected.sign_key != null &&
selected.sign_key != null && PgpHelper.hasPgpKey(context, recipients, true))
PgpHelper.hasPgpKey(context, recipients, true)) data.draft.ui_encrypt = ref.ui_encrypt;
data.draft.ui_encrypt = ref.ui_encrypt; } else if (EntityMessage.SMIME_SIGNONLY.equals(ref.ui_encrypt) ||
} else if (EntityMessage.SMIME_SIGNONLY.equals(ref.ui_encrypt) || EntityMessage.SMIME_SIGNENCRYPT.equals(ref.ui_encrypt)) {
EntityMessage.SMIME_SIGNENCRYPT.equals(ref.ui_encrypt)) { if (ActivityBilling.isPro(context) &&
if (ActivityBilling.isPro(context) && selected.sign_key_alias != null &&
selected.sign_key_alias != null && SmimeHelper.hasSmimeKey(context, recipients, true))
SmimeHelper.hasSmimeKey(context, recipients, true)) data.draft.ui_encrypt = ref.ui_encrypt;
data.draft.ui_encrypt = ref.ui_encrypt; }
}
} }
// Reply template // Reply template

Write Preview
Loading…
Cancel
Save