Delete S/MIME signature data on lock

3 years ago · f377f6ba89
parent 90ba42b113
commit f377f6ba89
1 changed files with 4 additions and 3 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@ -5592,12 +5592,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.

            boolean inline = true;
            List<EntityAttachment> attachments = db.attachment().getAttachments(message.id);
-            for (EntityAttachment attachment : attachments) {
+            for (EntityAttachment attachment : attachments)
                if (attachment.encryption != null) {
                    inline = false;
-                    break;
+                    if (EntityMessage.SMIME_SIGNENCRYPT.equals(message.ui_encrypt) &&
+                            !EntityAttachment.SMIME_MESSAGE.equals(attachment.encryption))
+                        db.attachment().deleteAttachment(attachment.id);
                }
-            }

            if (inline) {
                if (message.uid == null)