From 6e8f982e7bedede3c16add0b6b2e73b2fdd5c61b Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Wed, 8 Oct 2025 11:59:48 -0400
Subject: [PATCH] Process notification profiles before accounts during storage
 sync.

---
 .../java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt | 2 +-
 .../thoughtcrime/securesms/storage/StorageSyncHelper.kt    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt
index f99ea92681..b1702723f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt
@@ -464,11 +464,11 @@ class StorageSyncJob private constructor(parameters: Parameters, private var loc
     ContactRecordProcessor().process(records.contacts, StorageSyncHelper.KEY_GENERATOR)
     GroupV1RecordProcessor().process(records.gv1, StorageSyncHelper.KEY_GENERATOR)
     GroupV2RecordProcessor().process(records.gv2, StorageSyncHelper.KEY_GENERATOR)
+    NotificationProfileRecordProcessor().process(records.notificationProfileRecords, StorageSyncHelper.KEY_GENERATOR)
     AccountRecordProcessor(context, freshSelf()).process(records.account, StorageSyncHelper.KEY_GENERATOR)
     StoryDistributionListRecordProcessor().process(records.storyDistributionLists, StorageSyncHelper.KEY_GENERATOR)
     CallLinkRecordProcessor().process(records.callLinkRecords, StorageSyncHelper.KEY_GENERATOR)
     ChatFolderRecordProcessor().process(records.chatFolderRecords, StorageSyncHelper.KEY_GENERATOR)
-    NotificationProfileRecordProcessor().process(records.notificationProfileRecords, StorageSyncHelper.KEY_GENERATOR)
   }
 
   private fun getAllLocalStorageIds(self: Recipient): List<StorageId> {
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 2164b0d493..12bb392013 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
@@ -310,13 +310,12 @@ object StorageSyncHelper {
           val localProfile = SignalDatabase.notificationProfiles.getProfile(query)
 
           if (localProfile == null) {
-            Log.w(TAG, "Unable to find local notification profile with given remote id")
+            Log.w(TAG, "Unable to find local notification profile with given remote id $remoteId")
           } else {
-            val disabledAt = System.currentTimeMillis()
-            Log.i(TAG, "Setting manually enabled profile to ${localProfile.id} ending at $remoteEndTime. Disabled at: $disabledAt")
+            Log.i(TAG, "Setting manually enabled profile to ${localProfile.id} ending at $remoteEndTime.")
             SignalStore.notificationProfile.manuallyEnabledProfile = localProfile.id
             SignalStore.notificationProfile.manuallyEnabledUntil = remoteEndTime
-            SignalStore.notificationProfile.manuallyDisabledAt = disabledAt
+            SignalStore.notificationProfile.manuallyDisabledAt = 0L
           }
         }
       } else if (update.new.proto.notificationProfileManualOverride!!.disabledAtTimestampMs != null) {