Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent viewing backup key when unregistered.

Browse Source
This commit is contained in:
Cody Henthorne
2025-06-10 11:04:01 -04:00
parent fa9229779e
commit 178c468436
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -500,6 +500,7 @@ private fun RemoteBackupsSettingsContent(
} else if (state.backupsEnabled) {
appendBackupDetailsItems(
backupState = state.backupState,
canViewBackupKey = state.canViewBackupKey,
backupRestoreState = backupRestoreState,
backupProgress = backupProgress,
lastBackupTimestamp = state.lastBackupTimestamp,
@@ -800,6 +801,7 @@ private fun DescriptionText(
private fun LazyListScope.appendBackupDetailsItems(
backupState: RemoteBackupsSettingsState.BackupState,
canViewBackupKey: Boolean,
backupRestoreState: BackupRestoreState,
backupProgress: ArchiveUploadProgressState?,
lastBackupTimestamp: Long,
@@ -901,7 +903,8 @@ private fun LazyListScope.appendBackupDetailsItems(
item {
Rows.TextRow(
text = stringResource(R.string.RemoteBackupsSettingsFragment__view_backup_key),
onClick = contentCallbacks::onViewBackupKeyClick
onClick = contentCallbacks::onViewBackupKeyClick,
enabled = canViewBackupKey
)
}

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

@@ -13,6 +13,7 @@ import kotlin.time.Duration.Companion.seconds
data class RemoteBackupsSettingsState(
val backupsEnabled: Boolean,
val canViewBackupKey: Boolean = false,
val canBackUpUsingCellular: Boolean = false,
val canRestoreUsingCellular: Boolean = false,
val hasRedemptionError: Boolean = false,

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

@@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.jobs.BackupMessagesJob
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.keyvalue.protos.ArchiveUploadProgressState
import org.thoughtcrime.securesms.service.MessageBackupListener
import org.thoughtcrime.securesms.util.TextSecurePreferences
import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
import java.math.BigDecimal
import java.util.Currency
@@ -68,6 +69,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
private val _state = MutableStateFlow(
RemoteBackupsSettingsState(
backupsEnabled = SignalStore.backup.areBackupsEnabled,
canViewBackupKey = !TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application),
lastBackupTimestamp = SignalStore.backup.lastBackupTime,
backupsFrequency = SignalStore.backup.backupFrequency,
canBackUpUsingCellular = SignalStore.backup.backupWithCellular,