From 7b21667657b503f2021b0ad6b5873d206d74fa73 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 6 Jul 2020 11:29:34 +0200 Subject: [PATCH] S/MIME is natively supported --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 7 +++++-- 1 file changed, 5 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 a7c3df0855..a80cb9c93b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -3401,8 +3401,11 @@ public class FragmentCompose extends FragmentBase { // Encryption if (ref.ui_encrypt != null && !EntityMessage.ENCRYPT_NONE.equals(ref.ui_encrypt)) { - if (ActivityBilling.isPro(context) && Helper.isOpenKeychainInstalled(context)) - data.draft.ui_encrypt = ref.ui_encrypt; + if (ActivityBilling.isPro(context)) + if (Helper.isOpenKeychainInstalled(context) || + EntityMessage.SMIME_SIGNONLY.equals(ref.encrypt) || + EntityMessage.SMIME_SIGNENCRYPT.equals(ref.encrypt)) + data.draft.ui_encrypt = ref.ui_encrypt; } // Reply template