From 2cd15ae87916ed80ba3498458e06966b755153a6 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 28 Oct 2024 09:46:14 -0400
Subject: [PATCH] Fix possible crash when colorizing group names

Fixes #13751
---
 .../thoughtcrime/securesms/conversation/colors/Colorizer.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/Colorizer.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/Colorizer.kt
index 704ac84e37..dada1bba6e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/Colorizer.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/Colorizer.kt
@@ -70,7 +70,7 @@ class Colorizer {
   fun getIncomingGroupSenderColor(context: Context, recipient: Recipient): Int {
     return if (groupMembers.isEmpty()) {
       groupSenderColors[recipient.id]?.getColor(context) ?: getDefaultColor(context, recipient)
-    } else {
+    } else if (recipient.hasServiceId) {
       val memberPosition = groupMembers.indexOf(recipient.requireServiceId())
 
       if (memberPosition >= 0) {
@@ -79,6 +79,8 @@ class Colorizer {
       } else {
         getDefaultColor(context, recipient)
       }
+    } else {
+      getDefaultColor(context, recipient)
     }
   }