From 67757b6fc3bd44587494b59e27163417d38e48ed Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 16 Mar 2019 10:38:40 +0000
Subject: [PATCH] Continue after deleting deleted message

---
 app/src/main/java/eu/faircode/email/Core.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 4d256b5e01..af8739effe 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -437,7 +437,10 @@ class Core {
                     Log.i(folder.name + " append confirmed uid=" + duid);
                 else {
                     Log.i(folder.name + " deleting uid=" + duid + " msgid=" + message.msgid);
-                    idelete.setFlag(Flags.Flag.DELETED, true);
+                    try {
+                        idelete.setFlag(Flags.Flag.DELETED, true);
+                    } catch (MessageRemovedException ignored) {
+                    }
                 }
             }
             ifolder.expunge();
@@ -550,7 +553,10 @@ class Core {
 
             // Delete source
             if (!copy) {
-                imessage.setFlag(Flags.Flag.DELETED, true);
+                try {
+                    imessage.setFlag(Flags.Flag.DELETED, true);
+                } catch (MessageRemovedException ignored) {
+                }
                 ifolder.expunge();
             }
         } finally {
@@ -569,7 +575,10 @@ class Core {
         Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid));
         for (Message imessage : imessages) {
             Log.i(folder.name + " deleting uid=" + message.uid + " msgid=" + message.msgid);
-            imessage.setFlag(Flags.Flag.DELETED, true);
+            try {
+                imessage.setFlag(Flags.Flag.DELETED, true);
+            } catch (MessageRemovedException ignored) {
+            }
         }
         ifolder.expunge();