Refactoring

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

@@ -57,11 +57,18 @@ public class JobDaily extends JobService {
     public boolean onStartJob(JobParameters args) {
         EntityLog.log(this, "Daily cleanup");
 
-        final DB db = DB.getInstance(this);
-
         executor.submit(new Runnable() {
             @Override
             public void run() {
+                cleanup(getApplicationContext());
+            }
+        });
+
+        return false;
+    }
+
+    static void cleanup(Context context) {
+        DB db = DB.getInstance(context);
         try {
             db.beginTransaction();
 
@@ -83,12 +90,12 @@ public class JobDaily extends JobService {
 
                 int messages = db.message().deleteMessagesBefore(folder.id, keep_time, false);
                 Log.i(Helper.TAG, "Cleanup folder=" + folder.account + ":" + folder.name +
-                                " deleted before=" + new Date(keep_time) + " count=" + messages);
+                        " before=" + new Date(keep_time) + " deleted=" + messages);
             }
 
             // Cleanup message files
             Log.i(Helper.TAG, "Cleanup message files");
-                    File[] messages = new File(getFilesDir(), "messages").listFiles();
+            File[] messages = new File(context.getFilesDir(), "messages").listFiles();
             if (messages != null)
                 for (File file : messages)
                     if (file.isFile()) {
@@ -102,7 +109,7 @@ public class JobDaily extends JobService {
 
             // Cleanup attachment files
             Log.i(Helper.TAG, "Cleanup attachment files");
-                    File[] attachments = new File(getFilesDir(), "attachments").listFiles();
+            File[] attachments = new File(context.getFilesDir(), "attachments").listFiles();
             if (attachments != null)
                 for (File file : attachments)
                     if (file.isFile()) {
@@ -127,10 +134,6 @@ public class JobDaily extends JobService {
             Log.i(Helper.TAG, "End daily job");
         }
     }
-        });
-
-        return false;
-    }
 
     @Override
     public boolean onStopJob(JobParameters args) {