From 0d56d9f79d0f976abde07d6f15d63cb472009dfd Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 2 Jul 2020 10:19:01 +0200 Subject: [PATCH] Refactoring --- app/src/main/java/eu/faircode/email/AdapterAccount.java | 4 ++-- .../main/java/eu/faircode/email/AdapterAttachment.java | 2 +- .../main/java/eu/faircode/email/AdapterAttachmentEML.java | 2 +- app/src/main/java/eu/faircode/email/AdapterIdentity.java | 2 +- app/src/main/java/eu/faircode/email/AdapterMessage.java | 8 ++++---- .../java/eu/faircode/email/BoundaryCallbackMessages.java | 2 +- app/src/main/java/eu/faircode/email/FragmentCompose.java | 3 ++- app/src/main/java/eu/faircode/email/FragmentMessages.java | 2 +- .../main/java/eu/faircode/email/FragmentOptionsMisc.java | 6 +++--- app/src/main/java/eu/faircode/email/Helper.java | 6 +++++- app/src/main/java/eu/faircode/email/Log.java | 4 ++-- app/src/main/java/eu/faircode/email/WorkerCleanup.java | 8 ++++---- 12 files changed, 27 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java index 47b7bbe08e..d4e0033e7e 100644 --- a/app/src/main/java/eu/faircode/email/AdapterAccount.java +++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java @@ -192,8 +192,8 @@ public class AdapterAccount extends RecyclerView.Adapter 0 || !settings ? View.GONE : View.VISIBLE); diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java index 49623a69ba..6ad74815eb 100644 --- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java +++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java @@ -127,7 +127,7 @@ public class AdapterAttachment extends RecyclerView.Adapter 0 ? " +" : "") + TextUtils.join(",", flags); diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index af2873d61d..008e5c3528 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -5179,7 +5179,8 @@ public class FragmentCompose extends FragmentBase { tvAddressError.setVisibility(address_error == null ? View.GONE : View.VISIBLE); tvRemindSize.setText(getString(R.string.title_size_reminder, - Helper.humanReadableByteCount(size, true), Helper.humanReadableByteCount(max_size, true))); + Helper.humanReadableByteCount(size), + Helper.humanReadableByteCount(max_size))); tvRemindSize.setVisibility(remind_size ? View.VISIBLE : View.GONE); tvRemindTo.setVisibility(send_reminders && remind_to ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 566b776874..f8bb324a95 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -6693,7 +6693,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (!TextUtils.isEmpty(attachment.name)) footer.appendText(" " + attachment.name); if (attachment.size != null) - footer.appendText(" " + Helper.humanReadableByteCount(attachment.size, true)); + footer.appendText(" " + Helper.humanReadableByteCount(attachment.size)); footer.appendElement("br"); } diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index 8e9b5cf511..ac68f15be6 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -439,7 +439,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc tvFtsIndexed.setText(getString(R.string.title_advanced_fts_indexed, stats.fts, stats.total, - Helper.humanReadableByteCount(FtsDbHelper.size(getContext()), true))); + Helper.humanReadableByteCount(FtsDbHelper.size(getContext())))); last = stats; } }); @@ -561,8 +561,8 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc tvMemoryClass.setText(getString(R.string.title_advanced_memory_class, class_mb + " MB")); tvStorageSpace.setText(getString(R.string.title_advanced_storage_space, - Helper.humanReadableByteCount(Helper.getAvailableStorageSpace(), true), - Helper.humanReadableByteCount(Helper.getTotalStorageSpace(), true))); + Helper.humanReadableByteCount(Helper.getAvailableStorageSpace()), + Helper.humanReadableByteCount(Helper.getTotalStorageSpace()))); tvFingerprint.setText(Helper.getFingerprint(getContext())); grpDebug.setVisibility(swDebug.isChecked() || BuildConfig.DEBUG ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 2e49c8e0c1..08039aefa5 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -697,7 +697,11 @@ public class Helper { private static final DecimalFormat df = new DecimalFormat("@@"); - static String humanReadableByteCount(long bytes, boolean si) { + static String humanReadableByteCount(long bytes) { + return humanReadableByteCount(bytes, true); + } + + private static String humanReadableByteCount(long bytes, boolean si) { int unit = si ? 1000 : 1024; if (bytes < unit) return bytes + " B"; int exp = (int) (Math.log(bytes) / Math.log(unit)); diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java index e4be99e81f..7571df4c49 100644 --- a/app/src/main/java/eu/faircode/email/Log.java +++ b/app/src/main/java/eu/faircode/email/Log.java @@ -1093,8 +1093,8 @@ public class Log { sb.append(String.format("Memory class: %d\r\n", am.getMemoryClass())); sb.append(String.format("Storage space: %s/%s\r\n", - Helper.humanReadableByteCount(Helper.getAvailableStorageSpace(), true), - Helper.humanReadableByteCount(Helper.getTotalStorageSpace(), true))); + Helper.humanReadableByteCount(Helper.getAvailableStorageSpace()), + Helper.humanReadableByteCount(Helper.getTotalStorageSpace()))); Runtime rt = Runtime.getRuntime(); long hused = (rt.totalMemory() - rt.freeMemory()) / 1024L; diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java index a9e756ca78..0c7084caaa 100644 --- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java +++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java @@ -264,13 +264,13 @@ public class WorkerCleanup extends Worker { long available = Helper.getAvailableStorageSpace(); if (size > 0 && size * 2.5 < available) { Log.i("Running VACUUM" + - " size=" + Helper.humanReadableByteCount(size, true) + - "/" + Helper.humanReadableByteCount(available, true)); + " size=" + Helper.humanReadableByteCount(size) + + "/" + Helper.humanReadableByteCount(available)); db.getOpenHelper().getWritableDatabase().execSQL("VACUUM;"); } else Log.w("Insufficient space for VACUUM" + - " size=" + Helper.humanReadableByteCount(size, true) + - "/" + Helper.humanReadableByteCount(available, true)); + " size=" + Helper.humanReadableByteCount(size) + + "/" + Helper.humanReadableByteCount(available)); }