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

Debug: skip reply sign/encrypt

Browse Source
pull/214/head
M66B 11 months ago
parent 74306ed5af
commit 70c27d6712
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File

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

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

Write Preview
Loading…
Cancel
Save