From 2cd47a27000364d6f65c6dc4717853003db27e36 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 6 Jun 2022 15:20:29 +0200 Subject: [PATCH] Final cleanup in app context --- app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 2 +- app/src/main/java/eu/faircode/email/WorkerCleanup.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index bc31616010..2d4c438119 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -640,7 +640,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences EntityLog.log(ServiceSynchronize.this, EntityLog.Type.Scheduling, "### stopped self eventId=" + eventId); - WorkerCleanup.cleanupConditionally(ServiceSynchronize.this); + WorkerCleanup.cleanupConditionally(getApplicationContext()); } } catch (Throwable ex) { Log.e(ex); diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java index 7247736b14..56b260da5f 100644 --- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java +++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java @@ -83,7 +83,7 @@ public class WorkerCleanup extends Worker { long now = new Date().getTime(); long last_cleanup = prefs.getLong("last_cleanup", 0); - if (last_cleanup + CLEANUP_INTERVAL * 3600 * 1000L > now) { + if (last_cleanup + 2 * CLEANUP_INTERVAL * 3600 * 1000L > now) { Log.i("Skip cleanup last=" + new Date(last_cleanup)); return; }