From 813ee4b3cc6ef3319829a84f9b9813ca98727be8 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 26 Aug 2022 17:40:34 +0200 Subject: [PATCH] Reply encrypted always --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 4238f3c10c..9c3a6f33e1 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -5044,13 +5044,15 @@ public class FragmentCompose extends FragmentBase { EntityMessage.PGP_SIGNENCRYPT.equals(ref.ui_encrypt)) { if (Helper.isOpenKeychainInstalled(context) && selected.sign_key != null && - PgpHelper.hasPgpKey(context, recipients)) + (EntityMessage.PGP_SIGNENCRYPT.equals(ref.ui_encrypt) || + 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 && - SmimeHelper.hasSmimeKey(context, recipients)) + (EntityMessage.SMIME_SIGNENCRYPT.equals(ref.ui_encrypt) || + SmimeHelper.hasSmimeKey(context, recipients))) data.draft.ui_encrypt = ref.ui_encrypt; } }