From 023d34f2b60412d2a9bb3e8432f822a1b842e692 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Thu, 9 Mar 2017 09:15:58 +0100 Subject: [PATCH] Simplify size formatting.. --- .../com/b44t/messenger/AndroidUtilities.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java b/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java index 4e3a206f9..036f5d1a9 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java @@ -799,15 +799,15 @@ public class AndroidUtilities { return null; } - public static String formatFileSize(long size) { - if (size < 1024) { - return String.format("%d Byte", size); - } else if (size < 1024 * 1024) { - return String.format("%.1f KiB", size / 1024.0f); - } else if (size < 1024 * 1024 * 1024) { - return String.format("%.1f MiB", size / 1024.0f / 1024.0f); - } else { - return String.format("%.1f GiB", size / 1024.0f / 1024.0f / 1024.0f); + public static String formatFileSize(long bytes) { + if( bytes >= 1024*1024 ) { + return String.format("%.1f MiB", bytes / 1024.0f / 1024.0f); + } + else if( bytes >= 1024 ) { + return String.format("%d KiB", (bytes+512) / 1024); + } + else { + return String.format("%d Byte", bytes); } }