PGP reminder only when not signing/encrypting

5 years ago · 8dca87ade2
parent c51f0e99e7
commit 8dca87ade2
1 changed files with 2 additions and 1 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@ -4114,7 +4114,8 @@ public class FragmentCompose extends FragmentBase {
                                args.putBoolean("remind_extra", true);

                            if (pgpService.isBound() &&
-                                    !EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt)) {
+                                    (draft.ui_encrypt == null ||
+                                            EntityMessage.ENCRYPT_NONE.equals(draft.ui_encrypt))) {
                                List<Address> recipients = new ArrayList<>();
                                if (draft.to != null)
                                    recipients.addAll(Arrays.asList(draft.to));