From d187e392d0738d91e42ccee7370fa8899db0ac3b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 13 Sep 2020 13:36:11 +0200
Subject: [PATCH] Revert "Selective expunged when UIDPLUS"

This reverts commit c0dd77e44c0bc56768b832193f9e5b10912e37b6.
---
 app/src/main/java/eu/faircode/email/Core.java | 32 +++++--------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 5acb171361..a741c00413 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -588,10 +588,7 @@ class Core {
                         try {
                             Log.i(name + " deleting uid=" + muid + " for msgid=" + msgid);
                             iexisting.setFlag(Flags.Flag.DELETED, true);
-                            if (MessageHelper.hasCapability(ifolder, "UIDPLUS"))
-                                ifolder.expunge(new Message[]{iexisting});
-                            else
-                                purged = true;
+                            purged = true;
                         } catch (MessageRemovedException ignored) {
                             Log.w(name + " existing gone uid=" + muid + " for msgid=" + msgid);
                         }
@@ -763,10 +760,7 @@ class Core {
                     if (imessage == null)
                         throw new MessageRemovedException();
                     imessage.setFlag(Flags.Flag.DELETED, true);
-                    if (MessageHelper.hasCapability(ifolder, "UIDPLUS"))
-                        ifolder.expunge(new Message[]{imessage});
-                    else
-                        ifolder.expunge();
+                    ifolder.expunge();
                 } catch (MessagingException ex) {
                     Log.w(ex);
                 }
@@ -904,13 +898,10 @@ class Core {
                 try {
                     Log.i(folder.name + " deleting uid=" + message.uid);
                     iexisting.setFlag(Flags.Flag.DELETED, true);
-                    if (MessageHelper.hasCapability(ifolder, "UIDPLUS"))
-                        ifolder.expunge(new Message[]{iexisting});
-                    else
-                        ifolder.expunge();
                 } catch (MessageRemovedException ignored) {
                     Log.w(folder.name + " existing gone uid=" + message.uid);
                 }
+                ifolder.expunge();
             }
         }
 
@@ -1027,13 +1018,9 @@ class Core {
             try {
                 for (Message imessage : map.keySet())
                     imessage.setFlag(Flags.Flag.DELETED, true);
-                if (MessageHelper.hasCapability(ifolder, "UIDPLUS"))
-                    ifolder.expunge(map.keySet().toArray(new Message[0]));
-                else
-                    ifolder.expunge();
-            } catch (MessageRemovedException ex) {
-                Log.w(ex);
+            } catch (MessageRemovedException ignored) {
             }
+            ifolder.expunge();
         } else {
             int count = MessageHelper.getMessageCount(ifolder);
             db.folder().setFolderTotal(folder.id, count < 0 ? null : count);
@@ -1240,7 +1227,7 @@ class Core {
                 Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid));
                 if (imessages == null)
                     Log.w(folder.name + " search for msgid=" + message.msgid + " returned null");
-                else {
+                else
                     for (Message iexisting : imessages) {
                         long muid = ifolder.getUID(iexisting);
                         Log.i(folder.name + " deleting uid=" + muid);
@@ -1250,13 +1237,10 @@ class Core {
                             Log.w(folder.name + " existing gone uid=" + muid);
                         }
                     }
-                    if (MessageHelper.hasCapability(ifolder, "UIDPLUS"))
-                        ifolder.expunge(imessages);
-                    else
-                        ifolder.expunge();
-                }
             }
 
+            ifolder.expunge();
+
             db.message().deleteMessage(message.id);
         } finally {
             int count = MessageHelper.getMessageCount(ifolder);