empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix equality comparison causing blank updates and "The group was updated" messages.

Browse source
This commit is contained in:
Alan Evans 2020-09-09 12:16:09 -03:00 • committed by GitHub
parent 867e95eef1
commit 935c831a7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstruct.java
View file

@ -106,7 +106,7 @@ public final class GroupChangeReconstruct {
.setRole(newState.getRole()));
}
if (oldState.getProfileKey() != newState.getProfileKey()) {
if (!oldState.getProfileKey().equals(newState.getProfileKey())) {
builder.addModifiedProfileKeys(newState);
}
}

14
libsignal/service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java
View file

@ -208,9 +208,10 @@ public final class GroupChangeReconstructTest {
@Test
public void to_admin() {
UUID uuid = UUID.randomUUID();
DecryptedGroup from = DecryptedGroup.newBuilder().addMembers(member(uuid)).build();
DecryptedGroup to = DecryptedGroup.newBuilder().addMembers(admin(uuid)).build();
UUID uuid = UUID.randomUUID();
ProfileKey profileKey = randomProfileKey();
DecryptedGroup from = DecryptedGroup.newBuilder().addMembers(withProfileKey(member(uuid), profileKey)).build();
DecryptedGroup to = DecryptedGroup.newBuilder().addMembers(withProfileKey(admin(uuid), profileKey)).build();
DecryptedGroupChange decryptedGroupChange = GroupChangeReconstruct.reconstructGroupChange(from, to);
@ -219,9 +220,10 @@ public final class GroupChangeReconstructTest {
@Test
public void to_member() {
UUID uuid = UUID.randomUUID();
DecryptedGroup from = DecryptedGroup.newBuilder().addMembers(admin(uuid)).build();
DecryptedGroup to = DecryptedGroup.newBuilder().addMembers(member(uuid)).build();
UUID uuid = UUID.randomUUID();
ProfileKey profileKey = randomProfileKey();
DecryptedGroup from = DecryptedGroup.newBuilder().addMembers(withProfileKey(admin(uuid), profileKey)).build();
DecryptedGroup to = DecryptedGroup.newBuilder().addMembers(withProfileKey(member(uuid), profileKey)).build();
DecryptedGroupChange decryptedGroupChange = GroupChangeReconstruct.reconstructGroupChange(from, to);