From 9073183ef3f07b13c438de86617f8493d07be09c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 27 Jan 2022 12:01:36 +0100
Subject: [PATCH] Cleanup on delete local messages

---
 app/src/main/java/eu/faircode/email/FragmentFolders.java | 2 ++
 app/src/main/java/eu/faircode/email/WorkerCleanup.java   | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 3c8b4b73ab..3e2c280576 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -950,6 +950,8 @@ public class FragmentFolders extends FragmentBase {
                     db.endTransaction();
                 }
 
+                WorkerCleanup.cleanup(context, false);
+
                 return null;
             }
 
diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
index 5ede9ab146..cb3a37b934 100644
--- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java
+++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
@@ -40,6 +40,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
 import io.requery.android.database.sqlite.SQLiteDatabase;
@@ -52,6 +53,8 @@ public class WorkerCleanup extends Worker {
     private static final long KEEP_IMAGES_DURATION = 3 * 24 * 3600 * 1000L; // milliseconds
     private static final long KEEP_CONTACTS_DURATION = 180 * 24 * 3600 * 1000L; // milliseconds
 
+    private static Semaphore semaphore = new Semaphore(1);
+
     public WorkerCleanup(@NonNull Context context, @NonNull WorkerParameters workerParams) {
         super(context, workerParams);
         Log.i("Instance " + getName());
@@ -98,6 +101,7 @@ public class WorkerCleanup extends Worker {
         long start = new Date().getTime();
         DB db = DB.getInstance(context);
         try {
+            semaphore.acquire();
             EntityLog.log(context, "Start cleanup manual=" + manual);
 
             if (manual) {
@@ -364,6 +368,7 @@ public class WorkerCleanup extends Worker {
         } catch (Throwable ex) {
             Log.e(ex);
         } finally {
+            semaphore.release();
             EntityLog.log(context, "End cleanup=" + (new Date().getTime() - start) + " ms");
 
             long now = new Date().getTime();