From 8daf1bca202f00adcf3d040f71612f931cffa761 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 9 Apr 2024 15:56:15 -0400
Subject: [PATCH] Improve handling of unknown groups.

---
 .../securesms/recipients/LiveRecipient.java            |  2 +-
 .../securesms/recipients/RecipientCreator.kt           | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipient.java
index 694199e181..fba94fb12f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipient.java
@@ -215,7 +215,7 @@ public final class LiveRecipient {
     if (groupRecord.isPresent()) {
       return RecipientCreator.forGroup(groupRecord.get(), record);
     } else {
-      return RecipientCreator.forUnknown();
+      return RecipientCreator.forUnknownGroup(record.getId(), record.getGroupId());
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientCreator.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientCreator.kt
index f7d26fb72c..b2073cccd4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientCreator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientCreator.kt
@@ -6,6 +6,7 @@ import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.database.RecipientTable.RegisteredState
 import org.thoughtcrime.securesms.database.model.GroupRecord
 import org.thoughtcrime.securesms.database.model.RecipientRecord
+import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.Util
@@ -105,6 +106,15 @@ object RecipientCreator {
     return Recipient.UNKNOWN
   }
 
+  @JvmStatic
+  fun forUnknownGroup(id: RecipientId, groupId: GroupId?): Recipient {
+    return Recipient(
+      id = id,
+      isResolving = true,
+      groupIdValue = groupId
+    )
+  }
+
   @VisibleForTesting
   fun create(
     resolved: Boolean,