From 80adac68c8b18945f35d833cb7b17d3da7542a6e Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sat, 30 Mar 2024 15:30:40 -0400
Subject: [PATCH] ui: Use KiB instead of KB for free space

Fixes #19.
---
 .../im/angry/openeuicc/ui/ProfileDownloadFragment.kt   |  3 +--
 .../main/java/im/angry/openeuicc/util/StringUtils.kt   | 10 +++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
index 78a54f2..feb0ab0 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
@@ -5,7 +5,6 @@ import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
 import android.text.Editable
-import android.text.format.Formatter
 import android.util.Log
 import android.view.*
 import android.widget.ProgressBar
@@ -131,7 +130,7 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
             // Fetch remaining NVRAM
             val str = channel.lpa.euiccInfo2?.freeNvram?.also {
                 freeNvram = it
-            }?.let { Formatter.formatShortFileSize(requireContext(), it.toLong()) }
+            }?.let { formatFreeSpace(it) }
 
             withContext(Dispatchers.Main) {
                 profileDownloadFreeSpace.text = getString(R.string.profile_download_free_space,
diff --git a/app-common/src/main/java/im/angry/openeuicc/util/StringUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/StringUtils.kt
index cca0874..ebf8729 100644
--- a/app-common/src/main/java/im/angry/openeuicc/util/StringUtils.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/util/StringUtils.kt
@@ -19,4 +19,12 @@ fun ByteArray.encodeHex(): String {
         sb.append(String.format("%02X", this[i]))
     }
     return sb.toString()
-}
\ No newline at end of file
+}
+
+fun formatFreeSpace(size: Int): String =
+    // SIM cards probably won't have much more space anytime soon.
+    if (size >= 1024) {
+        "%.2f KiB".format(size.toDouble() / 1024)
+    } else {
+        "$size B"
+    }
\ No newline at end of file