From a37b89feaf429145e1df2400a57df450226500bd Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 5 Nov 2021 15:02:19 -0400
Subject: [PATCH] Fix NPE when rendering group member item.

---
 .../securesms/groups/ui/GroupMemberListAdapter.java          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
index 4a37f238d..1d5cd0a28 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
@@ -215,7 +215,10 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
     void bindImageAndText(@NonNull Recipient recipient, @NonNull String displayText, @Nullable String about) {
       this.recipient.setText(displayText);
       this.avatar.setRecipient(recipient);
-      this.badge.setBadgeFromRecipient(recipient);
+
+      if (this.badge != null) {
+        this.badge.setBadgeFromRecipient(recipient);
+      }
 
       if (this.about != null) {
         this.about.setText(about);