From 2bb9ae2dc3a736ca451a73067bdbdbcdf590d360 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 26 Mar 2022 15:22:49 +0100
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/Core.java | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index f6a8ac6977..5521a87343 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2695,7 +2695,6 @@ class Core {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean uid_expunge = prefs.getBoolean("uid_expunge", false);
-        int chunk_size = prefs.getInt("chunk_size", DEFAULT_CHUNK_SIZE);
 
         if (uid_expunge)
             uid_expunge = MessageHelper.hasCapability(ifolder, "UIDPLUS");
@@ -2708,14 +2707,7 @@ class Core {
                 return;
 
             Log.i(ifolder.getName() + " expunging " + TextUtils.join(",", uids));
-            ifolder.doCommand(new IMAPFolder.ProtocolCommand() {
-                @Override
-                public Object doCommand(IMAPProtocol protocol) throws ProtocolException {
-                    for (List<Long> list : Helper.chunkList(uids, chunk_size))
-                        protocol.uidexpunge(UIDSet.createUIDSets(Helper.toLongArray(list)));
-                    return null;
-                }
-            });
+            uidExpunge(context, ifolder, uids);
             Log.i(ifolder.getName() + " expunged " + TextUtils.join(",", uids));
         } else
             ifolder.expunge();
@@ -4470,7 +4462,6 @@ class Core {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean perform_expunge = prefs.getBoolean("perform_expunge", true);
         boolean uid_expunge = prefs.getBoolean("uid_expunge", false);
-        int chunk_size = prefs.getInt("chunk_size", DEFAULT_CHUNK_SIZE);
 
         if (!perform_expunge)
             return false;
@@ -4498,15 +4489,7 @@ class Core {
                     }
 
                 Log.i(ifolder.getName() + " expunging " + TextUtils.join(",", uids));
-                ifolder.doCommand(new IMAPFolder.ProtocolCommand() {
-                    @Override
-                    public Object doCommand(IMAPProtocol protocol) throws ProtocolException {
-                        // https://datatracker.ietf.org/doc/html/rfc4315#section-2.1
-                        for (List<Long> list : Helper.chunkList(uids, chunk_size))
-                            protocol.uidexpunge(UIDSet.createUIDSets(Helper.toLongArray(list)));
-                        return null;
-                    }
-                });
+                uidExpunge(context, ifolder, uids);
                 Log.i(ifolder.getName() + " expunged " + TextUtils.join(",", uids));
             } else {
                 Log.i(ifolder.getName() + " expunging all");
@@ -4522,6 +4505,21 @@ class Core {
         }
     }
 
+    private static void uidExpunge(Context context, IMAPFolder ifolder, List<Long> uids) throws MessagingException {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        int chunk_size = prefs.getInt("chunk_size", DEFAULT_CHUNK_SIZE);
+
+        ifolder.doCommand(new IMAPFolder.ProtocolCommand() {
+            @Override
+            public Object doCommand(IMAPProtocol protocol) throws ProtocolException {
+                // https://datatracker.ietf.org/doc/html/rfc4315#section-2.1
+                for (List<Long> list : Helper.chunkList(uids, chunk_size))
+                    protocol.uidexpunge(UIDSet.createUIDSets(Helper.toLongArray(list)));
+                return null;
+            }
+        });
+    }
+
     private static EntityIdentity matchIdentity(Context context, EntityFolder folder, EntityMessage message) {
         DB db = DB.getInstance(context);