From 3b5d9a2cae2c1cfdd5499b0ca3aee88ea1850e76 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 19 Dec 2019 11:29:31 -0500 Subject: [PATCH] Consider groups 'unknown' if they have no title, avatar, or members. --- .../securesms/database/GroupDatabase.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/database/GroupDatabase.java b/src/org/thoughtcrime/securesms/database/GroupDatabase.java index 239a895523..30addc720e 100644 --- a/src/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/src/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -114,7 +114,16 @@ public class GroupDatabase extends Database { } public boolean isUnknownGroup(String groupId) { - return !getGroup(groupId).isPresent(); + Optional group = getGroup(groupId); + + if (!group.isPresent()) { + return true; + } + + boolean noMetadata = group.get().getAvatar() == null && TextUtils.isEmpty(group.get().getTitle()); + boolean noMembers = group.get().getMembers().isEmpty() || (group.get().getMembers().size() == 1 && group.get().getMembers().contains(Recipient.self().getId())); + + return noMetadata && noMembers; } public Reader getGroupsFilteredByTitle(String constraint, boolean includeInactive) {