diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt index ac34041e08..7baf47fa75 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt @@ -152,7 +152,7 @@ class RemoteBackupsSettingsFragment : ComposeFragment() { requestedSnackbar = state.snackbar, contentCallbacks = callbacks, backupProgress = backupProgress, - backupSize = state.backupSize, + backupMediaSize = state.backupMediaSize, backupState = state.backupState, backupRestoreState = restoreState, hasRedemptionError = state.hasRedemptionError @@ -353,7 +353,7 @@ private fun RemoteBackupsSettingsContent( requestedSnackbar: RemoteBackupsSettingsState.Snackbar, contentCallbacks: ContentCallbacks, backupProgress: ArchiveUploadProgressState?, - backupSize: Long, + backupMediaSize: Long, hasRedemptionError: Boolean ) { val snackbarHostState = remember { @@ -448,9 +448,10 @@ private fun RemoteBackupsSettingsContent( } appendBackupDetailsItems( + backupState = backupState, backupProgress = backupProgress, lastBackupTimestamp = lastBackupTimestamp, - backupSize = backupSize, + backupMediaSize = backupMediaSize, backupsFrequency = backupsFrequency, canBackUpUsingCellular = canBackUpUsingCellular, canRestoreUsingCellular = canRestoreUsingCellular, @@ -569,9 +570,10 @@ private fun RemoteBackupsSettingsContent( } private fun LazyListScope.appendBackupDetailsItems( + backupState: RemoteBackupsSettingsState.BackupState, backupProgress: ArchiveUploadProgressState?, lastBackupTimestamp: Long, - backupSize: Long, + backupMediaSize: Long, backupsFrequency: BackupFrequency, canBackUpUsingCellular: Boolean, canRestoreUsingCellular: Boolean, @@ -598,21 +600,23 @@ private fun LazyListScope.appendBackupDetailsItems( } } - item { - Rows.TextRow(text = { - Column { - Text( - text = stringResource(id = R.string.RemoteBackupsSettingsFragment__backup_size), - style = MaterialTheme.typography.bodyLarge, - color = MaterialTheme.colorScheme.onSurface - ) - Text( - text = Util.getPrettyFileSize(backupSize), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant - ) - } - }) + if (backupState !is RemoteBackupsSettingsState.BackupState.ActiveFree) { + item { + Rows.TextRow(text = { + Column { + Text( + text = stringResource(id = R.string.RemoteBackupsSettingsFragment__backup_size), + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurface + ) + Text( + text = Util.getPrettyFileSize(backupMediaSize), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + }) + } } item { @@ -1319,7 +1323,7 @@ private fun RemoteBackupsSettingsContentPreview() { requestedSnackbar = RemoteBackupsSettingsState.Snackbar.NONE, contentCallbacks = object : ContentCallbacks {}, backupProgress = null, - backupSize = 2300000, + backupMediaSize = 2300000, backupState = RemoteBackupsSettingsState.BackupState.ActiveFree( messageBackupsType = MessageBackupsType.Free(mediaRetentionDays = 30) ), diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsState.kt index d52dce1abd..8c4dd9049a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsState.kt @@ -17,7 +17,7 @@ data class RemoteBackupsSettingsState( val canRestoreUsingCellular: Boolean = false, val hasRedemptionError: Boolean = false, val backupState: BackupState = BackupState.Loading, - val backupSize: Long = 0, + val backupMediaSize: Long = 0, val backupsFrequency: BackupFrequency = BackupFrequency.DAILY, val lastBackupTimestamp: Long = 0, val dialog: Dialog = Dialog.NONE, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt index f7c4e71101..d268ac66fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt @@ -59,7 +59,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() { RemoteBackupsSettingsState( backupsEnabled = SignalStore.backup.areBackupsEnabled, lastBackupTimestamp = SignalStore.backup.lastBackupTime, - backupSize = SignalStore.backup.totalBackupSize, + backupMediaSize = SignalStore.backup.totalBackupSize, backupsFrequency = SignalStore.backup.backupFrequency, canBackUpUsingCellular = SignalStore.backup.backupWithCellular, canRestoreUsingCellular = SignalStore.backup.restoreWithCellular @@ -162,7 +162,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() { backupsEnabled = SignalStore.backup.areBackupsEnabled, backupState = RemoteBackupsSettingsState.BackupState.Loading, lastBackupTimestamp = SignalStore.backup.lastBackupTime, - backupSize = SignalStore.backup.totalBackupSize, + backupMediaSize = SignalStore.backup.totalBackupSize, backupsFrequency = SignalStore.backup.backupFrequency, canBackUpUsingCellular = SignalStore.backup.backupWithCellular, canRestoreUsingCellular = SignalStore.backup.restoreWithCellular