Collapse multiple join request/cancels when from a single person.

app/src/main/java/org/thoughtcrime/securesms/sms/GroupV2UpdateMessageUtil.java

@@ -2,10 +2,14 @@ package org.thoughtcrime.securesms.sms;
 
 import androidx.annotation.NonNull;
 
+import com.google.protobuf.ByteString;
+
 import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
 import org.thoughtcrime.securesms.mms.MessageGroupContext;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
 
+import java.util.Optional;
+
 /**
  * Helper util for inspecting GV2 {@link MessageGroupContext} for various message processing.
  */
@@ -42,4 +46,29 @@ public final class GroupV2UpdateMessageUtil {
                                                                      .build();
     return DecryptedGroupUtil.changeIsEmpty(withoutDeletedMembers);
   }
+
+  public static boolean isJoinRequestCancel(@NonNull MessageGroupContext groupContext) {
+    if (isGroupV2(groupContext) && isUpdate(groupContext)) {
+      DecryptedGroupChange decryptedGroupChange = groupContext.requireGroupV2Properties()
+                                                              .getChange();
+
+      return decryptedGroupChange.getDeleteRequestingMembersCount() > 0;
+    }
+
+    return false;
+  }
+
+  public static int getChangeRevision(@NonNull MessageGroupContext groupContext) {
+    if (isGroupV2(groupContext) && isUpdate(groupContext)) {
+      return groupContext.requireGroupV2Properties().getChange().getRevision();
+    }
+    return -1;
+  }
+
+  public static Optional<ByteString> getChangeEditor(MessageGroupContext groupContext) {
+    if (isGroupV2(groupContext) && isUpdate(groupContext)) {
+      return Optional.ofNullable(groupContext.requireGroupV2Properties().getChange().getEditor());
+    }
+    return Optional.empty();
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupUpdateMessage.java

@@ -1,8 +1,12 @@
 package org.thoughtcrime.securesms.sms;
 
+import com.google.protobuf.ByteString;
+
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context;
 import org.thoughtcrime.securesms.mms.MessageGroupContext;
 
+import java.util.Optional;
+
 import static org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContext;
 
 public final class IncomingGroupUpdateMessage extends IncomingTextMessage {
@@ -43,4 +47,16 @@ public final class IncomingGroupUpdateMessage extends IncomingTextMessage {
   public boolean isJustAGroupLeave() {
     return GroupV2UpdateMessageUtil.isJustAGroupLeave(groupContext);
   }
+
+  public boolean isCancelJoinRequest() {
+    return GroupV2UpdateMessageUtil.isJoinRequestCancel(groupContext);
+  }
+
+  public int getChangeRevision() {
+    return GroupV2UpdateMessageUtil.getChangeRevision(groupContext);
+  }
+
+  public Optional<ByteString> getChangeEditor() {
+    return GroupV2UpdateMessageUtil.getChangeEditor(groupContext);
+  }
 }