From e2d4ca9a4c545a764b39725d292461db28154511 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 4 May 2026 13:49:14 +0000
Subject: [PATCH] Improve StorageSyncJob job data reliability.

---
 .../org/thoughtcrime/securesms/jobs/StorageSyncJob.kt    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 42f6b03814..89c2ebdd56 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt
@@ -632,8 +632,13 @@ class StorageSyncJob private constructor(parameters: Parameters, private var loc
 
   class Factory : Job.Factory<StorageSyncJob?> {
     override fun create(parameters: Parameters, serializedData: ByteArray?): StorageSyncJob {
-      val data = serializedData?.let { StorageSyncJobData.ADAPTER.decode(it) } ?: StorageSyncJobData()
-      return StorageSyncJob(parameters, data.localManifestOutOfDate)
+      return try {
+        val data = serializedData?.let { StorageSyncJobData.ADAPTER.decode(it) } ?: StorageSyncJobData()
+        StorageSyncJob(parameters, localManifestOutOfDate = data.localManifestOutOfDate)
+      } catch (e: IOException) {
+        Log.w(TAG, "Error deserializing StorageSyncJob", e)
+        StorageSyncJob(parameters, localManifestOutOfDate = false)
+      }
     }
   }
 }