From 6643256d54ba8f9d9ed1f981cb18dc17e4aa107b Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 6 Jan 2025 12:27:06 -0500
Subject: [PATCH] Ensure new manifest is saved after rotation.

---
 .../thoughtcrime/securesms/jobs/StorageRotateManifestJob.kt   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageRotateManifestJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageRotateManifestJob.kt
index e2eee3ca5a..2d4136b1ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageRotateManifestJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageRotateManifestJob.kt
@@ -90,6 +90,10 @@ class StorageRotateManifestJob private constructor(parameters: Parameters) : Job
       StorageServiceRepository.WriteStorageRecordsResult.Success -> {
         Log.i(TAG, "Successfully rotated the manifest as version ${manifestWithNewVersion.version}.${manifestWithNewVersion.sourceDeviceId}. Clearing restore key.")
         SignalStore.svr.masterKeyForInitialDataRestore = null
+
+        Log.i(TAG, "Saved new manifest. Now at version: ${manifestWithNewVersion.versionString}")
+        SignalStore.storageService.manifest = manifestWithNewVersion
+
         Result.success()
       }
       StorageServiceRepository.WriteStorageRecordsResult.ConflictError -> {