From 8b54cea1196db6f7edd719f08c65dc6daf451fca Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 21 Mar 2025 11:25:35 -0400
Subject: [PATCH] Fix potential NPE during archive export.

---
 .../securesms/backup/v2/exporters/ChatItemArchiveExporter.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
index 896c43bb10..69b7988f65 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
@@ -612,7 +612,7 @@ private fun BackupMessageRecord.toRemoteSessionSwitchoverUpdate(): ChatUpdateMes
   return ChatUpdateMessage(
     sessionSwitchover = try {
       val event = SessionSwitchoverEvent.ADAPTER.decode(Base64.decodeOrThrow(this.body))
-      SessionSwitchoverChatUpdate(event.e164.e164ToLong()!!)
+      SessionSwitchoverChatUpdate(event.e164.e164ToLong() ?: 0)
     } catch (e: IOException) {
       SessionSwitchoverChatUpdate()
     }