From 8c7bbd77e1694e1fcee5b140c76779bb5a383957 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 15 Sep 2021 07:15:51 +0200
Subject: [PATCH] Added logging

---
 app/src/main/java/eu/faircode/email/Core.java | 19 ++++++++++++++++++-
 .../eu/faircode/email/EntityOperation.java    |  3 ++-
 .../eu/faircode/email/ServiceSynchronize.java |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index a5e39e5e3c..a191c6daa2 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -190,7 +190,7 @@ class Core {
 
             int retry = 0;
             boolean group = true;
-            Log.i(folder.name + " executing operations=" + ops.size());
+            Log.i(folder.name + " executing sequence=" + sequence + " operations=" + ops.size());
             while (retry < LOCAL_RETRY_MAX && ops.size() > 0 &&
                     state.isRunning() &&
                     state.batchCanRun(folder.id, priority, sequence)) {
@@ -679,6 +679,12 @@ class Core {
             else {
                 if (state.batchCanRun(folder.id, priority, sequence))
                     state.error(new OperationCanceledException("Processing"));
+                else {
+                    if (state.isProcessing())
+                        Log.e(folder.name + " cannot run " +
+                                " sequence=" + sequence +
+                                " batch=" + state.getBatch(folder.id, priority));
+                }
             }
         } finally {
             Log.i(folder.name + " end process state=" + state + " pending=" + ops.size());
@@ -5359,6 +5365,17 @@ class Core {
             }
         }
 
+        boolean isProcessing() {
+            return process;
+        }
+
+        Long getBatch(long folder, int priority) {
+            synchronized (this) {
+                FolderPriority key = new FolderPriority(folder, priority);
+                return batch.get(key);
+            }
+        }
+
         @NonNull
         @Override
         public String toString() {
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 9e08745089..51505e20c1 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -460,7 +460,8 @@ public class EntityOperation {
                     break;
                 }
 
-        db.operation().deleteOperation(fid, SYNC);
+        int count = db.operation().deleteOperation(fid, SYNC);
+        Log.i("Deleted stale sync=" + count);
         sync(context, fid, false, force);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 6926b503a3..e61d52bc0f 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1878,6 +1878,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
 
                                                         Log.i(folder.name +
                                                                 " executing partition=" + key +
+                                                                " sequence=" + sequence +
                                                                 " operations=" + partition.size());
 
                                                         // Get folder