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

app/src/testShared/org/thoughtcrime/securesms/database/model/databaseprotos/DecryptedGroupHelper.kt

@@ -0,0 +1,64 @@
+package org.thoughtcrime.securesms.database.model.databaseprotos
+
+import com.google.protobuf.ByteString
+import org.signal.storageservice.protos.groups.Member
+import org.signal.storageservice.protos.groups.local.DecryptedGroupChange
+import org.signal.storageservice.protos.groups.local.DecryptedMember
+import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember
+import org.signal.zkgroup.groups.GroupMasterKey
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.util.UuidUtil
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import java.util.UUID
+
+fun groupContext(masterKey: GroupMasterKey, init: DecryptedGroupV2Context.Builder.() -> Unit): DecryptedGroupV2Context {
+  val builder = DecryptedGroupV2Context.newBuilder()
+  builder.context = encryptedGroupContext(masterKey)
+  builder.init()
+  return builder.build()
+}
+
+fun groupChange(editor: ServiceId, init: DecryptedGroupChange.Builder.() -> Unit): DecryptedGroupChange {
+  val builder = DecryptedGroupChange.newBuilder()
+  builder.editor = editor.toByteString()
+  builder.init()
+  return builder.build()
+}
+
+fun encryptedGroupContext(masterKey: GroupMasterKey): SignalServiceProtos.GroupContextV2 {
+  return SignalServiceProtos.GroupContextV2.newBuilder().setMasterKey(ByteString.copyFrom(masterKey.serialize())).build()
+}
+
+fun DecryptedGroupChange.Builder.addRequestingMember(serviceId: ServiceId) {
+  addNewRequestingMembers(requestingMember(serviceId))
+}
+
+fun DecryptedGroupChange.Builder.deleteRequestingMember(serviceId: ServiceId) {
+  addDeleteRequestingMembers(serviceId.toByteString())
+}
+
+fun DecryptedGroupChange.Builder.addMember(serviceId: ServiceId) {
+  addNewMembers(member(serviceId))
+}
+
+fun ServiceId.toByteString(): ByteString {
+  return UuidUtil.toByteString(uuid())
+}
+
+fun member(serviceId: UUID, role: Member.Role = Member.Role.DEFAULT, joinedAt: Int = 0): DecryptedMember {
+  return member(ServiceId.from(serviceId), role, joinedAt)
+}
+
+fun member(serviceId: ServiceId, role: Member.Role = Member.Role.DEFAULT, joinedAt: Int = 0): DecryptedMember {
+  return DecryptedMember.newBuilder()
+    .setRole(role)
+    .setUuid(serviceId.toByteString())
+    .setJoinedAtRevision(joinedAt)
+    .build()
+}
+
+fun requestingMember(serviceId: ServiceId): DecryptedRequestingMember {
+  return DecryptedRequestingMember.newBuilder()
+    .setUuid(serviceId.toByteString())
+    .build()
+}