From ce86b511f08b2e8253a47c1d729285d0c69be332 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Tue, 16 Dec 2025 12:13:23 -0500
Subject: [PATCH] Clear profile override if none exists.

---
 .../org/thoughtcrime/securesms/storage/StorageSyncHelper.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 8daa31ec21..67c7a4020d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
@@ -208,7 +208,7 @@ object StorageSyncHelper {
     }
   }
 
-  private fun getNotificationProfileManualOverride(): AccountRecord.NotificationProfileManualOverride {
+  private fun getNotificationProfileManualOverride(): AccountRecord.NotificationProfileManualOverride? {
     val profile = SignalDatabase.notificationProfiles.getProfile(SignalStore.notificationProfile.manuallyEnabledProfile)
     return if (profile != null && profile.deletedTimestampMs == 0L) {
       Log.i(TAG, "Setting a manually enabled profile ${profile.id}")
@@ -226,7 +226,7 @@ object StorageSyncHelper {
         disabledAtTimestampMs = SignalStore.notificationProfile.manuallyDisabledAt
       )
     } else {
-      AccountRecord.NotificationProfileManualOverride()
+      null
     }
   }