From ae4a3433f90ccc8fa69bda6892ce86060b12338d Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 20 Nov 2025 17:36:35 -0400
Subject: [PATCH] Set proper tier when writing to storage service.

---
 .../securesms/storage/AccountRecordProcessor.kt          | 1 +
 .../thoughtcrime/securesms/storage/StorageSyncHelper.kt  | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.kt
index 776aba4c87..6a4d0825a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.kt
@@ -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)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
index 12bb392013..c3e1b1211a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
@@ -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()