From 400c592acf00344f1fb2d7387407ba67eeb29dec Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Wed, 10 Jun 2020 17:16:47 -0300
Subject: [PATCH] Display 'Unknown group' for groups with no name.

---
 .../thoughtcrime/securesms/database/GroupDatabase.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
index 97944756d40..8d04d6db8ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
@@ -215,13 +215,15 @@ public GroupId.Mms getOrCreateMmsGroupForMembers(List<RecipientId> members) {
     }
   }
 
-  public List<String> getPushGroupNamesContainingMember(RecipientId recipientId) {
+  @WorkerThread
+  public List<String> getPushGroupNamesContainingMember(@NonNull RecipientId recipientId) {
     return Stream.of(getPushGroupsContainingMember(recipientId))
-                 .map(GroupRecord::getTitle)
+                 .map(groupRecord -> Recipient.resolved(groupRecord.getRecipientId()).getDisplayName(context))
                  .toList();
   }
 
-  public List<GroupRecord> getPushGroupsContainingMember(RecipientId recipientId) {
+  @WorkerThread
+  public @NonNull List<GroupRecord> getPushGroupsContainingMember(@NonNull RecipientId recipientId) {
     SQLiteDatabase database   = databaseHelper.getReadableDatabase();
     String         table      = TABLE_NAME + " INNER JOIN " + ThreadDatabase.TABLE_NAME + " ON " + TABLE_NAME + "." + RECIPIENT_ID + " = " + ThreadDatabase.TABLE_NAME + "." + ThreadDatabase.RECIPIENT_ID;
     String         query      = MEMBERS + " LIKE ? AND " + MMS + " = ?";