mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-25 19:29:54 +01:00
Add support for GV2 group update messages.
This commit is contained in:
Alan Evans
committed by
Greyson Parrelli
Greyson Parrelli
parent
1f994495f8
commit
326678f214
@@ -0,0 +1,589 @@
|
||||
package org.thoughtcrime.securesms.database.model;
|
||||
|
||||
import android.app.Application;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.signal.storageservice.protos.groups.AccessControl;
|
||||
import org.signal.storageservice.protos.groups.DisappearingMessagesTimer;
|
||||
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.DecryptedModifyMemberRole;
|
||||
import org.signal.storageservice.protos.groups.local.DecryptedPendingMember;
|
||||
import org.signal.storageservice.protos.groups.local.DecryptedPendingMemberRemoval;
|
||||
import org.signal.storageservice.protos.groups.local.DecryptedString;
|
||||
import org.whispersystems.signalservice.api.util.UuidUtil;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import static java.util.Collections.singletonList;
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(manifest = Config.NONE, application = Application.class)
|
||||
public final class GroupsV2UpdateMessageProducerTest {
|
||||
|
||||
private UUID you;
|
||||
private UUID alice;
|
||||
private UUID bob;
|
||||
|
||||
private GroupsV2UpdateMessageProducer producer;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
you = UUID.randomUUID();
|
||||
alice = UUID.randomUUID();
|
||||
bob = UUID.randomUUID();
|
||||
GroupsV2UpdateMessageProducer.DescribeMemberStrategy describeMember = createDescriber(ImmutableMap.of(alice, "Alice", bob, "Bob"));
|
||||
producer = new GroupsV2UpdateMessageProducer(ApplicationProvider.getApplicationContext(), describeMember, you);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void empty_change() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice updated the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void empty_change_by_you() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You updated the group.")));
|
||||
}
|
||||
|
||||
// Member additions
|
||||
|
||||
@Test
|
||||
public void member_added_member() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.addMember(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice added Bob.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_added_member() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.addMember(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You added Bob.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_added_you() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.addMember(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice added you to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_added_you() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.addMember(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You joined the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_added_themselves() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.addMember(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Bob joined the group.")));
|
||||
}
|
||||
|
||||
// Member removals
|
||||
|
||||
@Test
|
||||
public void member_removed_member() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.deleteMember(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice removed Bob.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_removed_member() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.deleteMember(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You removed Bob.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_removed_you() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.deleteMember(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice removed you from the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_removed_you() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.deleteMember(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You left the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_removed_themselves() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.deleteMember(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Bob left the group.")));
|
||||
}
|
||||
|
||||
// Member role modifications
|
||||
|
||||
@Test
|
||||
public void you_make_member_admin() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.promoteToAdmin(alice)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You made Alice an admin.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_makes_member_admin() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.promoteToAdmin(alice)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Bob made Alice an admin.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_makes_you_admin() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.promoteToAdmin(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice made you an admin.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_revoked_member_admin() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.demoteToMember(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You revoked admin privileges from Bob.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_revokes_member_admin() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.demoteToMember(alice)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Bob revoked admin privileges from Alice.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_revokes_your_admin() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.demoteToMember(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice revoked your admin privileges.")));
|
||||
}
|
||||
|
||||
// Member invitation
|
||||
|
||||
@Test
|
||||
public void you_invited_member() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.invite(alice)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You invited Alice to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_invited_you() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.invite(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice invited you to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_invited_1_person() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.invite(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice invited 1 person to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_invited_2_persons() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.invite(bob)
|
||||
.invite(UUID.randomUUID())
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice invited 2 people to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_invited_3_persons_and_you() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.invite(alice)
|
||||
.invite(you)
|
||||
.invite(UUID.randomUUID())
|
||||
.invite(UUID.randomUUID())
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(Arrays.asList("Bob invited you to the group.", "Bob invited 3 people to the group.")));
|
||||
}
|
||||
|
||||
// Member invitation revocation
|
||||
|
||||
@Test
|
||||
public void member_uninvited_1_person() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.uninvite(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice revoked an invitation to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_uninvited_2_people() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.uninvite(bob)
|
||||
.uninvite(UUID.randomUUID())
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice revoked 2 invitations to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_uninvited_1_person() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.uninvite(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You revoked an invitation to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_uninvited_2_people() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.uninvite(bob)
|
||||
.uninvite(UUID.randomUUID())
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You revoked 2 invitations to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void pending_member_declines_invite() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.uninvite(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Someone declined an invitation to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_decline_invite() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.uninvite(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You declined the invitation to the group.")));
|
||||
}
|
||||
|
||||
// Promote pending members
|
||||
|
||||
@Test
|
||||
public void member_accepts_invite() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.promote(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Bob accepted an invitation to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_accept_invite() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.promote(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You accepted the invitation to the group.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_promotes_pending_member() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.promote(alice)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Bob added invited member Alice.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_promote_pending_member() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.promote(bob)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You added invited member Bob.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void member_promotes_you() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.promote(you)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Bob added you to the group.")));
|
||||
}
|
||||
|
||||
// Title change
|
||||
|
||||
@Test
|
||||
public void member_changes_title() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.title("New title")
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice changed the group name to \"New title\".")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_change_title() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.title("Title 2")
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You changed the group name to \"Title 2\".")));
|
||||
}
|
||||
|
||||
// Avatar change
|
||||
|
||||
@Test
|
||||
public void member_changes_avatar() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.avatar("Avatar1")
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice changed the group avatar.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_change_avatar() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.avatar("Avatar2")
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You changed the group avatar.")));
|
||||
}
|
||||
|
||||
// Timer change
|
||||
|
||||
@Test
|
||||
public void member_changes_timer() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.timer(10)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Bob set the disappearing message timer to 10 seconds.")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_change_timer() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.timer(60)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You set the disappearing message timer to 1 minute.")));
|
||||
}
|
||||
|
||||
// Attribute access change
|
||||
|
||||
@Test
|
||||
public void member_changes_attribute_access() {
|
||||
DecryptedGroupChange change = changeBy(bob)
|
||||
.attributeAccess(AccessControl.AccessRequired.MEMBER)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Bob changed who can edit group info to \"All members\".")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_changed_attribute_access() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.attributeAccess(AccessControl.AccessRequired.ADMINISTRATOR)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You changed who can edit group info to \"Only admins\".")));
|
||||
}
|
||||
|
||||
// Membership access change
|
||||
|
||||
@Test
|
||||
public void member_changes_membership_access() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.membershipAccess(AccessControl.AccessRequired.ADMINISTRATOR)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("Alice changed who can edit group membership to \"Only admins\".")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void you_changed_membership_access() {
|
||||
DecryptedGroupChange change = changeBy(you)
|
||||
.membershipAccess(AccessControl.AccessRequired.MEMBER)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(singletonList("You changed who can edit group membership to \"All members\".")));
|
||||
}
|
||||
|
||||
// Multiple changes
|
||||
|
||||
@Test
|
||||
public void multiple_changes() {
|
||||
DecryptedGroupChange change = changeBy(alice)
|
||||
.addMember(bob)
|
||||
.membershipAccess(AccessControl.AccessRequired.MEMBER)
|
||||
.title("Title")
|
||||
.timer(300)
|
||||
.build();
|
||||
|
||||
assertThat(producer.describeChange(change), is(Arrays.asList(
|
||||
"Alice added Bob.",
|
||||
"Alice changed the group name to \"Title\".",
|
||||
"Alice set the disappearing message timer to 5 minutes.",
|
||||
"Alice changed who can edit group membership to \"All members\".")));
|
||||
}
|
||||
|
||||
private static class ChangeBuilder {
|
||||
|
||||
private final DecryptedGroupChange.Builder builder;
|
||||
|
||||
ChangeBuilder(@NonNull UUID editor) {
|
||||
builder = DecryptedGroupChange.newBuilder()
|
||||
.setEditor(UuidUtil.toByteString(editor));
|
||||
}
|
||||
|
||||
ChangeBuilder addMember(@NonNull UUID newMember) {
|
||||
builder.addNewMembers(DecryptedMember.newBuilder()
|
||||
.setUuid(UuidUtil.toByteString(newMember)));
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder deleteMember(@NonNull UUID removedMember) {
|
||||
builder.addDeleteMembers(UuidUtil.toByteString(removedMember));
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder promoteToAdmin(@NonNull UUID member) {
|
||||
builder.addModifyMemberRoles(DecryptedModifyMemberRole.newBuilder()
|
||||
.setRole(Member.Role.ADMINISTRATOR)
|
||||
.setUuid(UuidUtil.toByteString(member)));
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder demoteToMember(@NonNull UUID member) {
|
||||
builder.addModifyMemberRoles(DecryptedModifyMemberRole.newBuilder()
|
||||
.setRole(Member.Role.DEFAULT)
|
||||
.setUuid(UuidUtil.toByteString(member)));
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder invite(@NonNull UUID potentialMember) {
|
||||
builder.addNewPendingMembers(DecryptedPendingMember.newBuilder()
|
||||
.setUuid(UuidUtil.toByteString(potentialMember)));
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder uninvite(@NonNull UUID pendingMember) {
|
||||
builder.addDeletePendingMembers(DecryptedPendingMemberRemoval.newBuilder()
|
||||
.setUuid(UuidUtil.toByteString(pendingMember)));
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder promote(@NonNull UUID pendingMember) {
|
||||
builder.addPromotePendingMembers(UuidUtil.toByteString(pendingMember));
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder title(@NonNull String newTitle) {
|
||||
builder.setNewTitle(DecryptedString.newBuilder()
|
||||
.setValue(newTitle));
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder avatar(@NonNull String newAvatar) {
|
||||
builder.setNewAvatar(DecryptedString.newBuilder()
|
||||
.setValue(newAvatar));
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder timer(int duration) {
|
||||
builder.setNewTimer(DisappearingMessagesTimer.newBuilder()
|
||||
.setDuration(duration));
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder attributeAccess(@NonNull AccessControl.AccessRequired accessRequired) {
|
||||
builder.setNewAttributeAccess(accessRequired);
|
||||
return this;
|
||||
}
|
||||
|
||||
ChangeBuilder membershipAccess(@NonNull AccessControl.AccessRequired accessRequired) {
|
||||
builder.setNewMemberAccess(accessRequired);
|
||||
return this;
|
||||
}
|
||||
|
||||
DecryptedGroupChange build() {
|
||||
return builder.build();
|
||||
}
|
||||
}
|
||||
|
||||
private ChangeBuilder changeBy(@NonNull UUID groupEditor) {
|
||||
return new ChangeBuilder(groupEditor);
|
||||
}
|
||||
|
||||
private @NonNull GroupsV2UpdateMessageProducer.DescribeMemberStrategy createDescriber(@NonNull Map<UUID, String> map) {
|
||||
return uuid -> {
|
||||
String name = map.get(uuid);
|
||||
assertNotNull(name);
|
||||
return name;
|
||||
};
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user