From 0f3b46a7317364253f680a92273df2d9255c8ccc Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 2 May 2022 10:44:42 +0200
Subject: [PATCH] Added free memory to breadcrumbs

---
 app/src/main/java/eu/faircode/email/ActivityBase.java         | 1 -
 app/src/main/java/eu/faircode/email/ApplicationEx.java        | 1 -
 .../main/java/eu/faircode/email/BoundaryCallbackMessages.java | 4 ++--
 app/src/main/java/eu/faircode/email/Core.java                 | 4 ----
 app/src/main/java/eu/faircode/email/EntityOperation.java      | 1 -
 app/src/main/java/eu/faircode/email/FragmentBase.java         | 1 -
 app/src/main/java/eu/faircode/email/Log.java                  | 2 ++
 app/src/main/java/eu/faircode/email/ServiceSend.java          | 1 -
 8 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index c9c5af844e..18b6cedb93 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -250,7 +250,6 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
         crumb.put("name", this.getClass().getName());
         crumb.put("before", Integer.toString(before));
         crumb.put("after", Integer.toString(after));
-        crumb.put("free", Integer.toString(Log.getFreeMemMb()));
         Log.breadcrumb("onSaveInstanceState", crumb);
 
         for (String key : outState.keySet())
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 2bcf90031f..7b256bcf5a 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -314,7 +314,6 @@ public class ApplicationEx extends Application
         Log.logMemory(this, "Trim memory level=" + level);
         Map<String, String> crumb = new HashMap<>();
         crumb.put("level", Integer.toString(level));
-        crumb.put("free", Integer.toString(Log.getFreeMemMb()));
         Log.breadcrumb("trim", crumb);
         super.onTrimMemory(level);
     }
diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index b4e9bb8636..02f97b5f49 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -183,7 +183,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
                 int free = Log.getFreeMemMb();
                 Map<String, String> crumb = new HashMap<>();
-                crumb.put("free", Integer.toString(free));
+                crumb.put("queued", Integer.toString(state.queued));
                 Log.breadcrumb("Boundary run", crumb);
 
                 Log.i("Boundary run free=" + free);
@@ -236,7 +236,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     Log.i("Boundary queued -" + state.queued);
                     Helper.gc();
 
-                    crumb.put("free", Integer.toString(Log.getFreeMemMb()));
+                    crumb.put("queued", Integer.toString(state.queued));
                     Log.breadcrumb("Boundary done", crumb);
 
                     final int f = found;
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 4c9e324154..2167c9b462 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -348,7 +348,6 @@ class Core {
                         crumb.put("tries", Integer.toString(op.tries));
                         crumb.put("similar", TextUtils.join(",", sids));
                         crumb.put("thread", Thread.currentThread().getName() + ":" + Thread.currentThread().getId());
-                        crumb.put("free", Integer.toString(Log.getFreeMemMb()));
                         Log.breadcrumb("start operation", crumb);
 
                         try {
@@ -514,7 +513,6 @@ class Core {
                         }
 
                         crumb.put("thread", Thread.currentThread().getName() + ":" + Thread.currentThread().getId());
-                        crumb.put("free", Integer.toString(Log.getFreeMemMb()));
                         Log.breadcrumb("end operation", crumb);
 
                         // Operation succeeded
@@ -3639,7 +3637,6 @@ class Core {
                         crumb.put("folder", folder.id + ":" + folder.type);
                         crumb.put("start", Integer.toString(from));
                         crumb.put("end", Integer.toString(i));
-                        crumb.put("free", Integer.toString(free));
                         crumb.put("partial", Boolean.toString(account.partial_fetch));
                         Log.breadcrumb("sync", crumb);
                         Log.i("Sync " + from + ".." + i + " free=" + free);
@@ -3758,7 +3755,6 @@ class Core {
                     crumb.put("folder", folder.id + ":" + folder.type);
                     crumb.put("start", Integer.toString(from));
                     crumb.put("end", Integer.toString(i));
-                    crumb.put("free", Integer.toString(free));
                     crumb.put("partial", Boolean.toString(account.partial_fetch));
                     Log.breadcrumb("download", crumb);
                     Log.i("Download " + from + ".." + i + " free=" + free);
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 5a4b2cb2fe..3af0169fc0 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -500,7 +500,6 @@ public class EntityOperation {
         crumb.put("folder", op.account + ":" + op.folder);
         if (op.message != null)
             crumb.put("message", Long.toString(op.message));
-        crumb.put("free", Integer.toString(Log.getFreeMemMb()));
         Log.breadcrumb("queued", crumb);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 11618603fc..937a6777f3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -207,7 +207,6 @@ public class FragmentBase extends Fragment {
         crumb.put("name", this.getClass().getName());
         crumb.put("before", Integer.toString(before));
         crumb.put("after", Integer.toString(after));
-        crumb.put("free", Integer.toString(Log.getFreeMemMb()));
         for (String key : outState.keySet()) {
             Object value = outState.get(key);
             crumb.put(key, value == null ? "" : value.getClass().getName());
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 899ccf566e..e0ac5b77fd 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -333,6 +333,8 @@ public class Log {
 
     public static void breadcrumb(String name, Map<String, String> crumb) {
         try {
+            crumb.put("free", Integer.toString(Log.getFreeMemMb()));
+
             StringBuilder sb = new StringBuilder();
             sb.append("Breadcrumb ").append(name);
             Map<String, Object> ocrumb = new HashMap<>();
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index b05c9f7ef8..d4bfa8ee6a 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -389,7 +389,6 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                         crumb.put("folder", op.folder + ":outbox");
                         if (op.message != null)
                             crumb.put("message", Long.toString(op.message));
-                        crumb.put("free", Integer.toString(Log.getFreeMemMb()));
                         Log.breadcrumb("operation", crumb);
 
                         switch (op.name) {