From c1bbda31581267a3348c1dab4b2c137234753bcd Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 13 Oct 2022 12:16:00 +0200 Subject: [PATCH] Enable encryption only when key available --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index b5de50ce25..7a60e539a1 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -5120,15 +5120,13 @@ public class FragmentCompose extends FragmentBase { EntityMessage.PGP_SIGNENCRYPT.equals(ref.ui_encrypt)) { if (Helper.isOpenKeychainInstalled(context) && selected.sign_key != null && - (EntityMessage.PGP_SIGNENCRYPT.equals(ref.ui_encrypt) || - PgpHelper.hasPgpKey(context, recipients))) + PgpHelper.hasPgpKey(context, recipients)) data.draft.ui_encrypt = ref.ui_encrypt; } else if (EntityMessage.SMIME_SIGNONLY.equals(ref.ui_encrypt) || EntityMessage.SMIME_SIGNENCRYPT.equals(ref.ui_encrypt)) { if (ActivityBilling.isPro(context) && selected.sign_key_alias != null && - (EntityMessage.SMIME_SIGNENCRYPT.equals(ref.ui_encrypt) || - SmimeHelper.hasSmimeKey(context, recipients))) + SmimeHelper.hasSmimeKey(context, recipients)) data.draft.ui_encrypt = ref.ui_encrypt; } }