Clean conditionaly when disabled

app/src/main/java/eu/faircode/email/ApplicationEx.java

@@ -139,7 +139,7 @@ public class ApplicationEx extends Application implements SharedPreferences.OnSh
         DisconnectBlacklist.init(this);
 
         WorkerWatchdog.init(this);
-        WorkerCleanup.queue(this);
+        WorkerCleanup.init(this);
 
         registerReceiver(onScreenOff, new IntentFilter(Intent.ACTION_SCREEN_OFF));
 

app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java

@@ -147,6 +147,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("enabled", checked).apply();
                 ServiceSynchronize.reschedule(getContext());
+                WorkerCleanup.init(getContext());
             }
         });
 

app/src/main/java/eu/faircode/email/ServiceSynchronize.java

@@ -454,6 +454,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                             // Stop service
                             stopSelf();
                             EntityLog.log(ServiceSynchronize.this, "### stop self eventId=" + eventId);
+
+                            WorkerCleanup.cleanupConditionally(ServiceSynchronize.this);
                         }
                     }
                 });

app/src/main/java/eu/faircode/email/WorkerCleanup.java

@@ -69,6 +69,24 @@ public class WorkerCleanup extends Worker {
         return Result.success();
     }
 
+    static void cleanupConditionally(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean enabled = prefs.getBoolean("enabled", true);
+        if (enabled) {
+            Log.i("Skip cleanup enabled=" + enabled);
+            return;
+        }
+
+        long now = new Date().getTime();
+        long last_cleanup = prefs.getLong("last_cleanup", 0);
+        if (last_cleanup + CLEANUP_INTERVAL * 3600 * 1000L > now) {
+            Log.i("Skip cleanup last=" + new Date(last_cleanup));
+            return;
+        }
+
+        cleanup(context, false);
+    }
+
     static void cleanup(Context context, boolean manual) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean fts = prefs.getBoolean("fts", true);
@@ -279,15 +297,19 @@ public class WorkerCleanup extends Worker {
         } finally {
             Log.i("End cleanup");
 
+            long now = new Date().getTime();
             prefs.edit()
                     .remove("crash_report_count")
-                    .putLong("last_cleanup", new Date().getTime())
+                    .putLong("last_cleanup", now)
                     .apply();
         }
     }
 
-    static void queue(Context context) {
+    static void init(Context context) {
         try {
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+            boolean enabled = prefs.getBoolean("enabled", true);
+            if (enabled) {
                 Log.i("Queuing " + getName() + " every " + CLEANUP_INTERVAL + " hours");
 
                 PeriodicWorkRequest workRequest =
@@ -298,18 +320,13 @@ public class WorkerCleanup extends Worker {
                         .enqueueUniquePeriodicWork(getName(), ExistingPeriodicWorkPolicy.KEEP, workRequest);
 
                 Log.i("Queued " + getName());
-        } catch (IllegalStateException ex) {
+            } else {
-            // https://issuetracker.google.com/issues/138465476
-            Log.w(ex);
-        }
-    }
-
-    static void cancel(Context context) {
-        try {
                 Log.i("Cancelling " + getName());
                 WorkManager.getInstance(context).cancelUniqueWork(getName());
                 Log.i("Cancelled " + getName());
+            }
         } catch (IllegalStateException ex) {
+            // https://issuetracker.google.com/issues/138465476
             Log.w(ex);
         }
     }