From 01383680d2ae9f00eec6556d7f07a25ca631e9af Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 9 Feb 2024 20:28:11 +0100
Subject: [PATCH] Garbage collect before/after sync

---
 .../faircode/email/BoundaryCallbackMessages.java |  6 +++---
 app/src/main/java/eu/faircode/email/Core.java    |  8 ++++----
 .../eu/faircode/email/FragmentOptionsMisc.java   |  2 +-
 app/src/main/java/eu/faircode/email/Helper.java  | 16 +++++-----------
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 98fb4aba2f..4fcb79337c 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -173,7 +173,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         executor.submit(new Runnable() {
             @Override
             public void run() {
-                Helper.gc();
+                Helper.gc("Boundary start");
 
                 int free = Log.getFreeMemMb();
                 Map<String, String> crumb = new HashMap<>();
@@ -228,7 +228,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 } finally {
                     state.queued.decrementAndGet();
                     Log.i("Boundary queued -" + state.queued.get());
-                    Helper.gc();
+                    Helper.gc("Boundary end");
 
                     crumb.put("queued", Integer.toString(state.queued.get()));
                     Log.breadcrumb("Boundary done", crumb);
@@ -994,7 +994,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
             ifolder = null;
             imessages = null;
 
-            Helper.gc();
+            Helper.gc("Boundary reset");
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 2649500d21..45835b25a5 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -411,9 +411,9 @@ class Core {
                                     break;
 
                                 case EntityOperation.SYNC:
-                                    Helper.gc();
+                                    Helper.gc("Sync start");
                                     onSynchronizeMessages(context, jargs, account, folder, (POP3Folder) ifolder, (POP3Store) istore, state);
-                                    Helper.gc();
+                                    Helper.gc("Sync end");
                                     break;
 
                                 case EntityOperation.PURGE:
@@ -501,9 +501,9 @@ class Core {
                                     break;
 
                                 case EntityOperation.SYNC:
-                                    Helper.gc();
+                                    Helper.gc("Sync start");
                                     onSynchronizeMessages(context, jargs, account, folder, (IMAPStore) istore, (IMAPFolder) ifolder, state);
-                                    Helper.gc();
+                                    Helper.gc("Sync end");
                                     break;
 
                                 case EntityOperation.SUBSCRIBE:
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index b3a0927b35..62ce2bf8f0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -1697,7 +1697,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         btnGC.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Helper.gc(true);
+                Helper.gc("Miscellaneous");
                 DB.shrinkMemory(v.getContext());
             }
         });
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 0038e2ec01..311043f7ef 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -3536,18 +3536,12 @@ public class Helper {
 
     // Miscellaneous
 
-    static void gc() {
-        gc(false);
-    }
-
-    static void gc(boolean force) {
-        if (force || BuildConfig.DEBUG) {
+    static void gc(String reason) {
+        try {
+            Log.i("GC " + reason);
             Runtime.getRuntime().gc();
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException ex) {
-                Log.e(ex);
-            }
+        } catch (Throwable ex) {
+            Log.e(ex);
         }
     }