From e9d3737955d175e54bf0ce42b929d1704f19ecd7 Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Fri, 8 Aug 2025 16:22:41 +0530 Subject: [PATCH] Fixed: File size unit / calculation differs from Kiwix-Server. * Changed the size calculation from GiB (binary format) to GB (decimal format). * Removed the unused `OnSwipeTouchListener` class. --- core/detekt_baseline.xml | 2 +- .../java/org/kiwix/kiwixmobile/core/zim_manager/Byte.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/detekt_baseline.xml b/core/detekt_baseline.xml index bda95d845..48ef1bc64 100644 --- a/core/detekt_baseline.xml +++ b/core/detekt_baseline.xml @@ -20,7 +20,7 @@ MagicNumber:DownloaderModule.kt$DownloaderModule$5 MagicNumber:FileUtils.kt$FileUtils$3 MagicNumber:JNIInitialiser.kt$JNIInitialiser$1024 - MagicNumber:Byte.kt$Byte$1024.0 + MagicNumber:Byte.kt$Byte$1000.0 MagicNumber:MainMenu.kt$MainMenu$99 MagicNumber:ReaderMenuState.kt$ReaderMenuState$99 MagicNumber:OnSwipeTouchListener.kt$OnSwipeTouchListener.GestureListener$100 diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/Byte.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/Byte.kt index 129e17528..7ef8811b0 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/Byte.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/Byte.kt @@ -27,9 +27,9 @@ value class Byte(private val byteString: String?) { val humanReadable get() = byteString?.toLongOrNull()?.let { val units = arrayOf("B", "KB", "MB", "GB", "TB") - val conversion = (log10(it.toDouble()) / log10(1024.0)).toInt() - DecimalFormat("#,##0.#") - .format(it / 1024.0.pow(conversion.toDouble())) + + val conversion = (log10(it.toDouble()) / log10(1000.0)).toInt() + DecimalFormat("#,##0.##") + .format(it / 1000.0.pow(conversion.toDouble())) + " " + units[conversion] }.orEmpty()