Refactoring

This commit is contained in:
M66B 2019-05-22 15:41:54 +02:00
parent 7a23d0bffd
commit 1f14c58ae8
5 changed files with 17 additions and 16 deletions

View File

@ -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;
}
});

View File

@ -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));

View File

@ -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);
}
}

View File

@ -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");
}

View File

@ -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 +