Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 19:29:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve GV2 Invitation revoke experience.

Browse Source
This commit is contained in:
Alan Evans
2020-08-06 15:06:15 -03:00
committed by Greyson Parrelli
parent c8ed0b19f0
commit 810ccf8e94
9 changed files with 241 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/test/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducerTest.java
View File

@@ -391,7 +391,16 @@ public final class GroupsV2UpdateMessageProducerTest {
}
@Test
public void unknown_invited_you() {
public void unknown_editor_but_known_invitee_invited_you() {
DecryptedGroupChange change = changeByUnknown()
.inviteBy(you, alice)
.build();
assertThat(describeChange(change), is(singletonList("Alice invited you to the group.")));
}
@Test
public void unknown_editor_and_unknown_inviter_invited_you() {
DecryptedGroupChange change = changeByUnknown()
.invite(you)
.build();
@@ -430,6 +439,18 @@ public final class GroupsV2UpdateMessageProducerTest {
assertThat(describeChange(change), is(Arrays.asList("You were invited to the group.", "3 people were invited to the group.")));
}
@Test
public void unknown_editor_invited_3_persons_and_you_inviter_known() {
DecryptedGroupChange change = changeByUnknown()
.invite(alice)
.inviteBy(you, bob)
.invite(UUID.randomUUID())
.invite(UUID.randomUUID())
.build();
assertThat(describeChange(change), is(Arrays.asList("Bob invited you to the group.", "3 people were invited to the group.")));
}
// Member invitation revocation
@Test
@@ -494,7 +515,7 @@ public final class GroupsV2UpdateMessageProducerTest {
.uninvite(you)
.build();
assertThat(describeChange(change), is(singletonList("Your invitation to the group was revoked.")));
assertThat(describeChange(change), is(singletonList("An admin revoked your invitation to the group.")));
}
@Test
@@ -525,7 +546,16 @@ public final class GroupsV2UpdateMessageProducerTest {
.uninvite(UUID.randomUUID())
.build();
assertThat(describeChange(change), is(Arrays.asList("Your invitation to the group was revoked.", "3 invitations to the group were revoked.")));
assertThat(describeChange(change), is(Arrays.asList("An admin revoked your invitation to the group.", "3 invitations to the group were revoked.")));
}
@Test
public void your_invite_was_revoked_by_known_member() {
DecryptedGroupChange change = changeBy(bob)
.uninvite(you)
.build();
assertThat(describeChange(change), is(singletonList("Bob revoked your invitation to the group.")));
}
// Promote pending members

7
app/src/test/java/org/thoughtcrime/securesms/groups/v2/ChangeBuilder.java
View File

@@ -72,8 +72,13 @@ public final class ChangeBuilder {
}
public ChangeBuilder invite(@NonNull UUID potentialMember) {
return inviteBy(potentialMember, UuidUtil.UNKNOWN_UUID);
}
public ChangeBuilder inviteBy(@NonNull UUID potentialMember, @NonNull UUID inviter) {
builder.addNewPendingMembers(DecryptedPendingMember.newBuilder()
.setUuid(UuidUtil.toByteString(potentialMember)));
.setUuid(UuidUtil.toByteString(potentialMember))
.setAddedByUuid(UuidUtil.toByteString(inviter)));
return this;
}