Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 10:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set proper tier when writing to storage service.

Browse Source
This commit is contained in:
Alex Hart
2025-11-20 17:36:35 -04:00
committed by jeffrey-signal
parent a3aeceb041
commit ae4a3433f9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.kt
View File

@@ -137,6 +137,7 @@ class AccountRecordProcessor(
username = remote.proto.username
usernameLink = remote.proto.usernameLink
notificationProfileManualOverride = remote.proto.notificationProfileManualOverride
backupTier = local.proto.backupTier ?: remote.proto.backupTier
safeSetPayments(payments?.enabled == true, payments?.entropy?.toByteArray())
safeSetSubscriber(donationSubscriberId, donationSubscriberCurrencyCode)

9
app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
View File

@@ -177,10 +177,11 @@ object StorageSyncHelper {
}
hasBackup = SignalStore.backup.areBackupsEnabled && SignalStore.backup.hasBackupBeenUploaded
if (SignalStore.backup.areBackupsEnabled && SignalStore.backup.backupTier != null) {
backupTier = getBackupLevelValue(SignalStore.backup.backupTier!!)
} else if (SignalStore.backup.backupTierInternalOverride != null) {
backupTier = getBackupLevelValue(SignalStore.backup.backupTierInternalOverride!!)
backupTier = when {
SignalStore.account.isLinkedDevice -> null
SignalStore.backup.areBackupsEnabled && SignalStore.backup.backupTier != null -> getBackupLevelValue(SignalStore.backup.backupTier!!)
SignalStore.backup.backupTierInternalOverride != null -> getBackupLevelValue(SignalStore.backup.backupTierInternalOverride!!)
else -> null
}
notificationProfileManualOverride = getNotificationProfileManualOverride()