From 531eddf84bfa6eafe7e31c535219be26bedf4e70 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 30 Apr 2022 22:35:22 +0200 Subject: [PATCH] Refactoring --- app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java | 3 +-- app/src/main/java/eu/faircode/email/Helper.java | 3 ++- app/src/main/java/eu/faircode/email/Log.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index d39320b1b2..23d68c9ed9 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -40,7 +40,6 @@ import android.os.Build; import android.os.Bundle; import android.os.Debug; import android.os.Environment; -import android.os.storage.StorageManager; import android.provider.Settings; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -1821,7 +1820,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc data.available = Helper.getAvailableStorageSpace(); data.total = Helper.getTotalStorageSpace(); data.used = Helper.getSize(context.getFilesDir()); - data.cache = Helper.getCacheSize(context); + data.cache = Helper.getCacheQuota(context); return data; } diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index e22e881a0e..d276699a45 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -2019,7 +2019,8 @@ public class Helper { return stats.getTotalBytes(); } - static long getCacheSize(Context context) { + static long getCacheQuota(Context context) { + // https://developer.android.com/reference/android/content/Context#getCacheDir() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) try { StorageManager sm = Helper.getSystemService(context, StorageManager.class); diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java index bf9409a531..e481b0d41f 100644 --- a/app/src/main/java/eu/faircode/email/Log.java +++ b/app/src/main/java/eu/faircode/email/Log.java @@ -1886,7 +1886,7 @@ public class Log { long storage_available = Helper.getAvailableStorageSpace(); long storage_total = Helper.getTotalStorageSpace(); long storage_used = Helper.getSize(context.getFilesDir()); - long cache = Helper.getCacheSize(context); + long cache = Helper.getCacheQuota(context); sb.append(String.format("Storage space: %s/%s App: %s cache: %s\r\n", Helper.humanReadableByteCount(storage_total - storage_available), Helper.humanReadableByteCount(storage_total),