From 460b097a7149b59c401be3b6989cb8e75424fe8a Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 28 Aug 2025 09:50:02 -0400
Subject: [PATCH] Ensure that all SignalValues are having the correct overrides
 called.

---
 .../org/thoughtcrime/securesms/keyvalue/ApkUpdateValues.kt  | 4 ++--
 .../org/thoughtcrime/securesms/keyvalue/BackupValues.kt     | 4 ++--
 .../java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ApkUpdateValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ApkUpdateValues.kt
index 74f39a9786..9b5a4fd7c8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ApkUpdateValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ApkUpdateValues.kt
@@ -19,8 +19,8 @@ class ApkUpdateValues(store: KeyValueStore) : SignalStoreValues(store) {
     private const val PENDING_APK_UPLOAD_TIME = "apk_update.pending_apk_upload_time"
   }
 
-  override fun onFirstEverAppLaunch() = Unit
-  override fun getKeysToIncludeInBackup(): List<String> = emptyList()
+  public override fun onFirstEverAppLaunch() = Unit
+  public override fun getKeysToIncludeInBackup(): List<String> = emptyList()
 
   val downloadId: Long by longValue(DOWNLOAD_ID, -2)
   val digest: ByteArray? get() = store.getBlob(DIGEST, null)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
index 9183417684..7d9384755e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
@@ -97,8 +97,8 @@ class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
     private val lock = ReentrantLock()
   }
 
-  override fun onFirstEverAppLaunch() = Unit
-  override fun getKeysToIncludeInBackup(): List<String> = emptyList()
+  public override fun onFirstEverAppLaunch() = Unit
+  public override fun getKeysToIncludeInBackup(): List<String> = emptyList()
 
   var cachedMediaCdnPath: String? by stringValue(KEY_CDN_MEDIA_PATH, null)
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt
index fb9c87826e..fc1fb631b4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt
@@ -82,6 +82,8 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
       notificationProfile.onFirstEverAppLaunch()
       releaseChannel.onFirstEverAppLaunch()
       story.onFirstEverAppLaunch()
+      apkUpdate.onFirstEverAppLaunch()
+      backup.onFirstEverAppLaunch()
     }
 
     @JvmStatic
@@ -111,7 +113,9 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
           imageEditor.keysToIncludeInBackup +
           notificationProfile.keysToIncludeInBackup +
           releaseChannel.keysToIncludeInBackup +
-          story.keysToIncludeInBackup
+          story.keysToIncludeInBackup +
+          apkUpdate.keysToIncludeInBackup +
+          backup.keysToIncludeInBackup
       }
 
     /**