From 9d1514308a2e7dedfb16b8dc3467d122f8a5260d Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 31 Jan 2024 19:39:36 -0500
Subject: [PATCH] Fix potential crash during contact splits.

---
 .../org/thoughtcrime/securesms/database/RecipientTable.kt    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
index 95cc140329..9a1a96812a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
@@ -2248,7 +2248,10 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    */
   fun splitForStorageSync(storageId: ByteArray) {
     val record = getByStorageId(storageId)!!
-    check(record.aci != null && record.pni != null)
+    if (record.aci == null || record.pni == null) {
+      Log.w(TAG, "Invalid state for split, ignoring.")
+      return
+    }
 
     writableDatabase
       .update(TABLE_NAME)