From 762c7a6d226c343c381b90b8e2a8da3a95a3a6ff Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 27 Jan 2025 11:33:00 -0500
Subject: [PATCH] Filter out some bad data in StorageForcePushJob.

---
 .../java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.kt
index bae4bea354..72ba26842c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
 import org.signal.core.util.logging.logI
+import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
@@ -84,6 +85,7 @@ class StorageForcePushJob private constructor(parameters: Parameters) : BaseJob(
     val newContactStorageIds = generateContactStorageIds(oldContactStorageIds)
     val inserts: MutableList<SignalStorageRecord> = oldContactStorageIds.keys
       .mapNotNull { SignalDatabase.recipients.getRecordForSync(it) }
+      .filter { it.recipientType != RecipientTable.RecipientType.INDIVIDUAL || (it.aci != null || it.pni != null || it.e164 != null) }
       .map { record -> StorageSyncModels.localToRemoteRecord(record, newContactStorageIds[record.id]!!.raw) }
       .toMutableList()