Experimental delete attachment support

app/src/main/java/eu/faircode/email/AdapterAttachment.java

@@ -137,7 +137,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
             lparam.setMarginStart(attachment.subsequence == null ? 0 : dp12);
             view.setLayoutParams(lparam);
 
-            ibDelete.setVisibility(readonly ? View.GONE : View.VISIBLE);
+            ibDelete.setVisibility(readonly && !BuildConfig.DEBUG ? View.GONE : View.VISIBLE);
 
             if (!readonly && attachment.isImage()) {
                 if (attachment.available) {
@@ -343,11 +343,13 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         private void onDelete(final EntityAttachment attachment) {
             Bundle args = new Bundle();
             args.putLong("id", attachment.id);
+            args.putBoolean("readonly", readonly);
 
             new SimpleTask<Void>() {
                 @Override
                 protected Void onExecute(Context context, Bundle args) {
                     long id = args.getLong("id");
+                    boolean readonly = args.getBoolean("readonly");
 
                     EntityAttachment attachment;
 
@@ -359,14 +361,22 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
                         if (attachment == null)
                             return null;
 
-                        db.attachment().deleteAttachment(attachment.id);
+                        if (readonly) {
+                            EntityMessage message = db.message().getMessage(attachment.message);
+                            if (message == null)
+                                return null;
+                            EntityOperation.queue(context, message, EntityOperation.ATTACHMENT, attachment.id, true);
+                            db.message().setMessageUiHide(message.id, true);
+                        } else
+                            db.attachment().deleteAttachment(attachment.id);
 
                         db.setTransactionSuccessful();
                     } finally {
                         db.endTransaction();
                     }
 
-                    attachment.getFile(context).delete();
+                    if (!readonly)
+                        attachment.getFile(context).delete();
 
                     return null;
                 }

app/src/main/java/eu/faircode/email/Core.java

@@ -118,6 +118,8 @@ import javax.mail.Header;
 import javax.mail.Message;
 import javax.mail.MessageRemovedException;
 import javax.mail.MessagingException;
+import javax.mail.Multipart;
+import javax.mail.Part;
 import javax.mail.Session;
 import javax.mail.Store;
 import javax.mail.StoreClosedException;
@@ -2054,6 +2056,7 @@ class Core {
         DB db = DB.getInstance(context);
 
         long id = jargs.getLong(0);
+        boolean delete = jargs.optBoolean(1, false);
 
         // Get attachment
         EntityAttachment attachment = db.attachment().getAttachment(id);
@@ -2073,15 +2076,58 @@ class Core {
         if (imessage == null)
             throw new MessageRemovedException();
 
-        // Get message parts
+        if (delete) {
-        MessageHelper helper = new MessageHelper((MimeMessage) imessage, context);
+            MimeMessage icopy = new MimeMessageEx((MimeMessage) imessage, message.msgid);
-        MessageHelper.MessageParts parts = helper.getMessageParts();
+            MessageHelper helper = new MessageHelper(icopy, context);
+            MessageHelper.MessageParts parts = helper.getMessageParts();
+            List<MessageHelper.AttachmentPart> aparts = parts.getAttachmentParts();
 
-        // Download attachment
+            if (attachment.sequence > aparts.size())
-        parts.downloadAttachment(context, attachment, folder);
+                throw new IllegalArgumentException("Invalid attachment sequence=" + attachment.sequence + "/" + aparts.size());
+            Part apart = aparts.get(attachment.sequence - 1).part;
+            if (!deletePart(icopy, apart))
+                throw new IllegalArgumentException("Attachment part not found");
 
-        if (attachment.size != null)
+            ifolder.appendMessages(new Message[]{icopy});
-            EntityLog.log(context, "Operation attachment size=" + attachment.size);
+
+            imessage.setFlag(Flags.Flag.DELETED, true);
+            expunge(context, ifolder, Arrays.asList(imessage));
+        } else {
+            // Get message parts
+            MessageHelper helper = new MessageHelper((MimeMessage) imessage, context);
+            MessageHelper.MessageParts parts = helper.getMessageParts();
+
+            // Download attachment
+            parts.downloadAttachment(context, attachment, folder);
+
+            if (attachment.size != null)
+                EntityLog.log(context, "Operation attachment size=" + attachment.size);
+        }
+    }
+
+    static boolean deletePart(Part part, Part attachment) throws MessagingException, IOException {
+        boolean deleted = false;
+        if (part.isMimeType("multipart/*")) {
+            Multipart multipart = (Multipart) part.getContent();
+            int count = multipart.getCount();
+            for (int i = 0; i < count; i++) {
+                Part child = multipart.getBodyPart(i);
+                if (child == attachment) {
+                    multipart.removeBodyPart(i);
+                    deleted = true;
+                } else {
+                    if (deletePart(child, attachment))
+                        deleted = true;
+                }
+            }
+        }
+
+        if (part instanceof MimeMessage)
+            ((MimeMessage) part).saveChanges();
+        else if (part instanceof Multipart)
+            part.setDataHandler(part.getDataHandler());
+
+        return deleted;
     }
 
     private static void onBody(Context context, JSONArray jargs, EntityFolder folder, EntityMessage message, POP3Folder ifolder, POP3Store istore) throws MessagingException, IOException {

app/src/main/java/eu/faircode/email/MimeMessageEx.java

@@ -30,6 +30,11 @@ public class MimeMessageEx extends MimeMessage {
     private String msgid;
     private MimeMessage original;
 
+    MimeMessageEx(MimeMessage imessage, String msgid) throws MessagingException {
+        super(imessage);
+        this.msgid = msgid;
+    }
+
     MimeMessageEx(Session session, String msgid) {
         super(session);
         this.msgid = msgid;