From 206f6d84e7d2765024c3b6738f049f0ecedee156 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 25 Mar 2026 15:47:46 -0300 Subject: [PATCH] Remove size line from backup info. --- .../ui/restore/local/RestoreLocalBackupViewModel.kt | 5 +---- .../ui/restore/local/SelectLocalBackupScreen.kt | 8 +------- .../ui/restore/local/SelectLocalBackupSheet.kt | 10 +++------- .../registration/ui/restore/local/SelectableBackup.kt | 3 +-- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupViewModel.kt index 458598b51d..de456a6564 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupViewModel.kt @@ -16,7 +16,6 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.withContext import org.signal.core.models.AccountEntropyPool -import org.signal.core.util.bytes import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.backup.v2.local.ArchiveFileSystem @@ -63,12 +62,10 @@ class RestoreLocalBackupViewModel : ViewModel() { DateUtils.formatDateWithYear(Locale.getDefault(), snapshot.timestamp) } val timeLabel = DateUtils.getOnlyTimeString(context, snapshot.timestamp) - val sizeBytes = SnapshotFileSystem(context, snapshot.file).mainLength() ?: 0L SelectableBackup( timestamp = snapshot.timestamp, - backupTime = "$dateLabel • $timeLabel", - backupSize = sizeBytes.bytes.toUnitString() + backupTime = "$dateLabel • $timeLabel" ) } .toPersistentList() diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectLocalBackupScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectLocalBackupScreen.kt index eeff6fa004..49680a2802 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectLocalBackupScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectLocalBackupScreen.kt @@ -118,11 +118,6 @@ fun YourBackupCard( icon = ImageVector.vectorResource(R.drawable.symbol_recent_24), text = selectedBackup.backupTime ) - - BackupInfoRow( - icon = ImageVector.vectorResource(R.drawable.symbol_file_24), - text = selectedBackup.backupSize - ) } } @@ -151,8 +146,7 @@ fun SelectLocalBackupScreenPreview() { SelectLocalBackupScreen( selectedBackup = SelectableBackup( timestamp = 0L, - backupTime = "Today \u2022 12:34 PM", - backupSize = "1.38 GB" + backupTime = "Today \u2022 12:34 PM" ), isSelectedBackupLatest = true, onRestoreBackupClick = {}, diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectLocalBackupSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectLocalBackupSheet.kt index 41065f87c2..1ad1f68d2c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectLocalBackupSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectLocalBackupSheet.kt @@ -76,7 +76,6 @@ fun SelectLocalBackupSheetContent( Rows.RadioRow( text = backup.backupTime, - label = backup.backupSize, selected = selection == backup, modifier = Modifier .horizontalGutters() @@ -110,19 +109,16 @@ private fun SelectLocalBackupSheetContentPreview() { SelectLocalBackupSheetContent( selectedBackup = SelectableBackup( timestamp = 0L, - backupTime = "Today \u2022 3:38am", - backupSize = "1.38 GB" + backupTime = "Today \u2022 3:38am" ), selectableBackups = persistentListOf( SelectableBackup( timestamp = 0L, - backupTime = "Today \u2022 3:38am", - backupSize = "1.38 GB" + backupTime = "Today \u2022 3:38am" ), SelectableBackup( timestamp = 1L, - backupTime = "August 13, 2024 \u2022 3:21am", - backupSize = "1.34 GB" + backupTime = "August 13, 2024 \u2022 3:21am" ) ), onBackupSelected = {} diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectableBackup.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectableBackup.kt index f6fe4fb81b..5f427289e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectableBackup.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/SelectableBackup.kt @@ -7,6 +7,5 @@ package org.thoughtcrime.securesms.registration.ui.restore.local data class SelectableBackup( val timestamp: Long, - val backupTime: String, - val backupSize: String + val backupTime: String )