diff --git a/app/src/main/java/app/grapheneos/pdfviewer/Utils.java b/app/src/main/java/app/grapheneos/pdfviewer/Utils.java index 3199b70..d7388a7 100644 --- a/app/src/main/java/app/grapheneos/pdfviewer/Utils.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/Utils.java @@ -9,21 +9,6 @@ import java.text.ParseException; import java.util.Calendar; public class Utils { - public static String parseFileSize(long fileSize) { - final double kb = fileSize / 1000d; - - if (kb == 0d) { - return fileSize + " Bytes"; - } - - final DecimalFormat format = new DecimalFormat("#.##"); - format.setRoundingMode(RoundingMode.CEILING); - - if (kb < 1000) { - return format.format(kb) + " kB (" + fileSize + " Bytes)"; - } - return format.format(kb / 1000) + " MB (" + fileSize + " Bytes)"; - } private static int parseIntSafely(String field) throws ParseException { try { diff --git a/app/src/main/java/app/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.kt b/app/src/main/java/app/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.kt index 9b70643..25c6d44 100644 --- a/app/src/main/java/app/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.kt +++ b/app/src/main/java/app/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.kt @@ -6,10 +6,10 @@ import android.net.Uri import android.provider.OpenableColumns import android.text.SpannableStringBuilder import android.text.Spanned +import android.text.format.Formatter import android.text.style.StyleSpan import android.util.Log import app.grapheneos.pdfviewer.R -import app.grapheneos.pdfviewer.Utils import org.json.JSONException class DocumentPropertiesLoader( @@ -103,7 +103,7 @@ class DocumentPropertiesLoader( val indexSize: Int = cursor.getColumnIndex(OpenableColumns.SIZE) if (indexSize >= 0) { val fileSize: Long = cursor.getString(indexSize).toLong() - collections[DocumentProperty.FileSize] = Utils.parseFileSize(fileSize) + collections[DocumentProperty.FileSize] = Formatter.formatShortFileSize(context, fileSize) } } return collections