Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 10:51:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not show backup size for non-media backups.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-02-10 12:58:14 -05:00
parent 73e0c8d632
commit f80ab7402a
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
View File

@@ -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)
),

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsState.kt
View File

@@ -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,

4
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt
View File

@@ -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