Cleanup/transaction

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

@@ -295,16 +295,28 @@ public class WorkerCleanup extends Worker {
             }
 
             Log.i("Cleanup contacts");
-            int contacts = db.contact().deleteContacts(now - KEEP_CONTACTS_DURATION);
+            try {
-            Log.i("Deleted contacts=" + contacts);
+                db.beginTransaction();
+                int contacts = db.contact().deleteContacts(now - KEEP_CONTACTS_DURATION);
+                db.setTransactionSuccessful();
+                Log.i("Deleted contacts=" + contacts);
+            } finally {
+                db.endTransaction();
+            }
 
             Log.i("Cleanup log");
             long before = now - KEEP_LOG_DURATION;
             while (true) {
-                int logs = db.log().deleteLogs(before, LOG_DELETE_BATCH_SIZE);
+                try {
-                Log.i("Deleted logs=" + logs + " before=" + new Date(before));
+                    db.beginTransaction();
-                if (logs < LOG_DELETE_BATCH_SIZE)
+                    int logs = db.log().deleteLogs(before, LOG_DELETE_BATCH_SIZE);
-                    break;
+                    db.setTransactionSuccessful();
+                    Log.i("Deleted logs=" + logs + " before=" + new Date(before));
+                    if (logs < LOG_DELETE_BATCH_SIZE)
+                        break;
+                } finally {
+                    db.endTransaction();
+                }
             }
 
             if (BuildConfig.DEBUG) {