From 620f720e7a24c46a31b8ac017f02e295c68f6202 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 24 Nov 2020 09:20:48 +0100
Subject: [PATCH] Relock inline encrypted

---
 .../eu/faircode/email/AdapterMessage.java     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a40e096973..8d5891e1e3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3816,6 +3816,29 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         if (message == null)
                             return null;
 
+                        boolean inline = true;
+                        List<EntityAttachment> attachments = db.attachment().getAttachments(message.id);
+                        for (EntityAttachment attachment : attachments) {
+                            if (attachment.encryption != null) {
+                                inline = false;
+                                break;
+                            }
+                        }
+
+                        if (inline) {
+                            if (message.uid == null)
+                                return null;
+
+                            EntityFolder folder = db.folder().getFolder(message.folder);
+                            if (folder == null)
+                                return null;
+
+                            db.message().deleteMessage(id);
+                            EntityOperation.queue(context, folder, EntityOperation.FETCH, message.uid);
+
+                            return null;
+                        }
+
                         File file = message.getFile(context);
                         Helper.writeText(file, null);
                         db.message().setMessageContent(message.id, true, null, null, null, null);