diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index cb00b84272..597dc80a9c 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -296,7 +296,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.getAvailableStorageSpace(), true), + Helper.humanReadableByteCount(Helper.getTotalStorageSpace(), true))); 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 f244d50fdc..fd74d4660a 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -614,6 +614,11 @@ public class Helper { return stats.getAvailableBlocksLong() * stats.getBlockSizeLong(); } + static long getTotalStorageSpace() { + StatFs stats = new StatFs(Environment.getDataDirectory().getAbsolutePath()); + return stats.getTotalBytes(); + } + static void openAdvanced(Intent intent) { // https://issuetracker.google.com/issues/72053350 intent.putExtra("android.content.extra.SHOW_ADVANCED", true); diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java index a4697d0126..cfbfb62884 100644 --- a/app/src/main/java/eu/faircode/email/Log.java +++ b/app/src/main/java/eu/faircode/email/Log.java @@ -775,8 +775,9 @@ public class Log { ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); sb.append(String.format("Memory class: %d\r\n", am.getMemoryClass())); - sb.append(String.format("Storage space: %s\r\n", - Helper.humanReadableByteCount(Helper.getAvailableStorageSpace(), true))); + sb.append(String.format("Storage space: %s/%s\r\n", + Helper.humanReadableByteCount(Helper.getAvailableStorageSpace(), true), + Helper.humanReadableByteCount(Helper.getTotalStorageSpace(), true))); Runtime rt = Runtime.getRuntime(); long hused = (rt.totalMemory() - rt.freeMemory()) / 1024L; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b00e2c363..b69801f021 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -361,7 +361,7 @@ Cleanup Processors: %1$d Memory class: %1$s - Storage space: %1$s + Storage space: %1$s/%2$s Last cleanup: %1$s All settings have sensible default values, which should only be changed if necessary