From 4e2999b61d69e883bc4df9e7a2c3fea70ce2451d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 10 May 2019 15:18:53 +0200
Subject: [PATCH] Refactoring

---
 .../java/eu/faircode/email/ApplicationEx.java | 68 ++++++++++---------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 21224e7711..8724c76287 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -100,6 +100,42 @@ public class ApplicationEx extends Application {
             }
         });
 
+        setupBugsnag();
+
+        upgrade(this);
+
+        createNotificationChannels();
+
+        if (Helper.hasWebView(this))
+            CookieManager.getInstance().setAcceptCookie(false);
+
+        MessageHelper.setSystemProperties();
+        ContactInfo.init(this, new Handler());
+        Core.init(this);
+    }
+
+    @Override
+    public void onTrimMemory(int level) {
+        logMemory("Trim memory level=" + level);
+        super.onTrimMemory(level);
+    }
+
+    @Override
+    public void onLowMemory() {
+        logMemory("Low memory");
+        super.onLowMemory();
+    }
+
+    private void logMemory(String message) {
+        ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo();
+        ActivityManager activityManager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
+        activityManager.getMemoryInfo(mi);
+        int mb = Math.round(mi.availMem / 0x100000L);
+        int perc = Math.round(mi.availMem / (float) mi.totalMem * 100.0f);
+        Log.i(message + " " + mb + " MB" + " " + perc + " %");
+    }
+
+    private void setupBugsnag() {
         // https://docs.bugsnag.com/platforms/android/sdk/
         com.bugsnag.android.Configuration config =
                 new com.bugsnag.android.Configuration("9d2d57476a0614974449a3ec33f2604a");
@@ -149,38 +185,6 @@ public class ApplicationEx extends Application {
                 return true;
             }
         });
-
-        upgrade(this);
-
-        createNotificationChannels();
-
-        if (Helper.hasWebView(this))
-            CookieManager.getInstance().setAcceptCookie(false);
-
-        MessageHelper.setSystemProperties();
-        ContactInfo.init(this, new Handler());
-        Core.init(this);
-    }
-
-    @Override
-    public void onTrimMemory(int level) {
-        logMemory("Trim memory level=" + level);
-        super.onTrimMemory(level);
-    }
-
-    @Override
-    public void onLowMemory() {
-        logMemory("Low memory");
-        super.onLowMemory();
-    }
-
-    private void logMemory(String message) {
-        ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo();
-        ActivityManager activityManager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
-        activityManager.getMemoryInfo(mi);
-        int mb = Math.round(mi.availMem / 0x100000L);
-        int perc = Math.round(mi.availMem / (float) mi.totalMem * 100.0f);
-        Log.i(message + " " + mb + " MB" + " " + perc + " %");
     }
 
     static void upgrade(Context context) {