From 570cf61d82a75b3dcfdb46411fedb6f67c3f96c8 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 4 Feb 2024 09:20:22 +0100 Subject: [PATCH] Debug: cleanup --- .../eu/faircode/email/FragmentCompose.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 41e2548cc1..0c779a1938 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -5809,20 +5809,19 @@ public class FragmentCompose extends FragmentBase { // Encryption List
recipients = data.draft.getAllRecipients(); - if (!BuildConfig.DEBUG) - if (EntityMessage.PGP_SIGNONLY.equals(ref.ui_encrypt) || - EntityMessage.PGP_SIGNENCRYPT.equals(ref.ui_encrypt)) { - if (PgpHelper.isOpenKeychainInstalled(context) && - selected.sign_key != null && - PgpHelper.hasPgpKey(context, recipients, true)) - 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, true)) - data.draft.ui_encrypt = ref.ui_encrypt; - } + if (EntityMessage.PGP_SIGNONLY.equals(ref.ui_encrypt) || + EntityMessage.PGP_SIGNENCRYPT.equals(ref.ui_encrypt)) { + if (PgpHelper.isOpenKeychainInstalled(context) && + selected.sign_key != null && + PgpHelper.hasPgpKey(context, recipients, true)) + 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, true)) + data.draft.ui_encrypt = ref.ui_encrypt; + } } // Reply template