diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferControlView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferControlView.kt index a5211ea00a..beced708b3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferControlView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferControlView.kt @@ -657,9 +657,9 @@ class TransferControlView @JvmOverloads constructor(context: Context, attrs: Att return if (isCompressing(currentState)) { return context.getString(R.string.TransferControlView__processing) } else { - val progressText = Formatter.formatShortFileSize(context, currentState.networkProgress.sumCompleted()) - val totalText = Formatter.formatShortFileSize(context, currentState.networkProgress.sumTotal()) - context.resources.getString(R.string.TransferControlView__download_progress, progressText, totalText) + val progressMiB = currentState.networkProgress.sumCompleted() / MEBIBYTE + val totalMiB = currentState.networkProgress.sumTotal() / MEBIBYTE + context.resources.getString(R.string.TransferControlView__download_progress, progressMiB, totalMiB) } } @@ -679,6 +679,7 @@ class TransferControlView @JvmOverloads constructor(context: Context, attrs: Att private const val SECONDARY_TEXT_OFFSET_DP = 3 private const val RETRY_SECONDARY_TEXT_OFFSET_DP = 6 private const val PRIMARY_TEXT_OFFSET_DP = 4 + private const val MEBIBYTE = 1048576f /** * A weighting compared to [UPLOAD_TASK_WEIGHT] diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 711f61cc2d..6ccf6c3161 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2421,8 +2421,8 @@ Processing… - - %1$s/%2$s + + %1.1f MB/%2.1f MB