From 1f14c58ae86e5e088c78bb92031a7e8b88e6f460 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 22 May 2019 15:41:54 +0200
Subject: [PATCH] Refactoring

---
 .../main/java/eu/faircode/email/ApplicationEx.java   |  2 +-
 app/src/main/java/eu/faircode/email/Core.java        |  6 +++---
 app/src/main/java/eu/faircode/email/Helper.java      | 11 -----------
 app/src/main/java/eu/faircode/email/Log.java         | 12 ++++++++++++
 .../java/eu/faircode/email/ViewModelMessages.java    |  2 +-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 7f901fc864..408a3d0106 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -229,7 +229,7 @@ public class ApplicationEx extends Application {
             public boolean run(@NonNull Error error) {
                 error.addToTab("extra", "installer", installer == null ? "-" : installer);
                 error.addToTab("extra", "fingerprint", fingerprint);
-                error.addToTab("extra", "free", Helper.getFreeMemMb());
+                error.addToTab("extra", "free", Log.getFreeMemMb());
                 return true;
             }
         });
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 8e41b659ee..282ba84d21 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -153,7 +153,7 @@ class Core {
                     crumb.put("name", op.name);
                     crumb.put("args", op.args);
                     crumb.put("folder", folder.type);
-                    crumb.put("free", Integer.toString(Helper.getFreeMemMb()));
+                    crumb.put("free", Integer.toString(Log.getFreeMemMb()));
                     crumb.put("UIDPLUS", Boolean.toString(((IMAPStore) istore).hasCapability("UIDPLUS")));
                     Bugsnag.leaveBreadcrumb("operation", BreadcrumbType.LOG, crumb);
 
@@ -1098,7 +1098,7 @@ class Core {
                             " " + (SystemClock.elapsedRealtime() - headers) + " ms");
                 }
 
-                int free = Helper.getFreeMemMb();
+                int free = Log.getFreeMemMb();
                 Map<String, String> crumb = new HashMap<>();
                 crumb.put("start", Integer.toString(from));
                 crumb.put("end", Integer.toString(i));
@@ -1163,7 +1163,7 @@ class Core {
                     Message[] isub = Arrays.copyOfRange(imessages, from, i + 1);
                     // Fetch on demand
 
-                    int free = Helper.getFreeMemMb();
+                    int free = Log.getFreeMemMb();
                     Map<String, String> crumb = new HashMap<>();
                     crumb.put("start", Integer.toString(from));
                     crumb.put("end", Integer.toString(i));
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 3ceec374a4..773e8b0b75 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -621,15 +621,4 @@ public class Helper {
         bundle.writeToParcel(p, 0);
         return p.dataSize();
     }
-
-    static long getFreeMem() {
-        Runtime rt = Runtime.getRuntime();
-        long used = (rt.totalMemory() - rt.freeMemory());
-        long max = rt.maxMemory();
-        return (max - used);
-    }
-
-    static int getFreeMemMb() {
-        return (int) (getFreeMem() / 1024L / 1024L);
-    }
 }
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 5c4ade6979..e260549846 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -480,6 +480,18 @@ public class Log {
         return bytes.length;
     }
 
+
+    static long getFreeMem() {
+        Runtime rt = Runtime.getRuntime();
+        long used = (rt.totalMemory() - rt.freeMemory());
+        long max = rt.maxMemory();
+        return (max - used);
+    }
+
+    static int getFreeMemMb() {
+        return (int) (getFreeMem() / 1024L / 1024L);
+    }
+
     static InternetAddress myAddress() throws UnsupportedEncodingException {
         return new InternetAddress("marcel+fairemail@faircode.eu", "FairCode");
     }
diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index 182dbb7f67..000f502b88 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -162,7 +162,7 @@ public class ViewModelMessages extends ViewModel {
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
                 boolean cache = prefs.getBoolean("cache_lists", true);
 
-                int free_mb = Helper.getFreeMemMb();
+                int free_mb = Log.getFreeMemMb();
                 boolean lowmem = (free_mb < LOW_MEM_MB);
 
                 Log.i("Destroy model=" + viewType +