From 8e45a546c959b0171970abdf5417ca8335b30119 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Fri, 24 Jul 2020 18:05:35 -0300
Subject: [PATCH] Fix NPE on Group multi-invite.

---
 .../thoughtcrime/securesms/groups/ui/GroupMemberEntry.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberEntry.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberEntry.java
index 57d12069fe..ccd32ce2ba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberEntry.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberEntry.java
@@ -9,6 +9,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DefaultValueLiveData;
 
 import java.util.Collection;
+import java.util.Objects;
 
 public abstract class GroupMemberEntry {
 
@@ -152,7 +153,7 @@ public abstract class GroupMemberEntry {
 
       PendingMember other = (PendingMember) obj;
       return other.invitee.equals(invitee) &&
-             other.inviteeCipherText.equals(inviteeCipherText) &&
+             Objects.equals(other.inviteeCipherText, inviteeCipherText) &&
              other.cancellable == cancellable;
     }
 
@@ -160,7 +161,7 @@ public abstract class GroupMemberEntry {
     public int hashCode() {
       int hash = invitee.hashCode();
       hash *= 31;
-      hash += inviteeCipherText.hashCode();
+      hash += Objects.hashCode(inviteeCipherText);
       hash *= 31;
       return hash + (cancellable ? 1 : 0);
     }