From 1ae23fb11f88aeba393ca2100ebc2a4293520f0c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 25 Apr 2019 11:26:26 +0200
Subject: [PATCH] Updated work manager

---
 app/build.gradle                              |  2 +-
 .../eu/faircode/email/ServiceSynchronize.java |  4 +-
 .../java/eu/faircode/email/WorkerCleanup.java | 42 ++++++++-----------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0cfd8db36b..583e84d20a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -108,7 +108,7 @@ dependencies {
     def room_version = "2.0.0"
     def paging_version = "2.1.0"
     def preference_version = "1.0.0"
-    def work_version = "2.0.1"
+    def work_version = "2.1.0-alpha01"
     def exif_version = "1.0.0"
     def billingclient_version = "1.2.2"
     def javamail_version = "1.6.3"
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 35d8d2531c..c84e14836c 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -151,7 +151,7 @@ public class ServiceSynchronize extends LifecycleService {
             }
         });
 
-        WorkerCleanup.queue();
+        WorkerCleanup.queue(this);
     }
 
     @Override
@@ -169,7 +169,7 @@ public class ServiceSynchronize extends LifecycleService {
             Log.e(ex);
         }
 
-        WorkerCleanup.cancel();
+        WorkerCleanup.cancel(this);
 
         stopForeground(true);
 
diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
index 66c0bbb3df..c51dd6cf58 100644
--- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java
+++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
@@ -6,8 +6,8 @@ import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.work.Constraints;
+import androidx.work.ExistingPeriodicWorkPolicy;
 import androidx.work.PeriodicWorkRequest;
-import androidx.work.WorkInfo;
 import androidx.work.WorkManager;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
@@ -21,8 +21,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
-
 public class WorkerCleanup extends Worker {
     private static final int CLEANUP_INTERVAL = 4; // hours
     private static final long CACHE_IMAGE_DURATION = 3 * 24 * 3600 * 1000L; // milliseconds
@@ -31,11 +29,13 @@ public class WorkerCleanup extends Worker {
 
     public WorkerCleanup(@NonNull Context context, @NonNull WorkerParameters workerParams) {
         super(context, workerParams);
+        Log.i("Instance " + getName());
     }
 
     @NonNull
     @Override
     public Result doWork() {
+        Log.i("Running " + getName());
         cleanup(getApplicationContext(), false);
         return Result.success();
     }
@@ -43,7 +43,6 @@ public class WorkerCleanup extends Worker {
     static void cleanup(Context context, boolean manual) {
         DB db = DB.getInstance(context);
         try {
-            Thread.currentThread().setPriority(THREAD_PRIORITY_BACKGROUND);
             Log.i("Start cleanup manual=" + manual);
 
             // Cleanup folders
@@ -160,37 +159,30 @@ public class WorkerCleanup extends Worker {
         }
     }
 
-    static void queue() {
-        String tag = WorkerCleanup.class.getSimpleName();
-        Log.i("Queuing " + tag);
-
-        try {
-            for (WorkInfo info : WorkManager.getInstance().getWorkInfosByTag(tag).get())
-                if (!info.getState().isFinished()) {
-                    Log.i("Already queued " + tag);
-                    return;
-                }
-        } catch (Throwable ex) {
-            Log.w(ex);
-        }
+    static void queue(Context context) {
+        Log.i("Queuing " + getName());
 
         Constraints.Builder constraints = new Constraints.Builder();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !BuildConfig.DEBUG)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
             constraints.setRequiresDeviceIdle(true);
 
         PeriodicWorkRequest workRequest =
                 new PeriodicWorkRequest.Builder(WorkerCleanup.class, CLEANUP_INTERVAL, TimeUnit.HOURS)
-                        .addTag(tag)
                         .setConstraints(constraints.build())
                         .build();
-        WorkManager.getInstance().enqueue(workRequest);
+        WorkManager.getInstance(context)
+                .enqueueUniquePeriodicWork(getName(), ExistingPeriodicWorkPolicy.KEEP, workRequest);
+
+        Log.i("Queued " + getName());
+    }
 
-        Log.i("Queued " + tag);
+    static void cancel(Context context) {
+        Log.i("Cancelling " + getName());
+        WorkManager.getInstance(context).cancelUniqueWork(getName());
+        Log.i("Cancelled " + getName());
     }
 
-    static void cancel() {
-        String tag = WorkerCleanup.class.getSimpleName();
-        Log.i("Cancelling " + tag);
-        WorkManager.getInstance().cancelAllWorkByTag(tag);
+    private static String getName() {
+        return WorkerCleanup.class.getSimpleName();
     }
 }