TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-08 05:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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())); .setRole(newState.getRole()));
} }
if (oldState.getProfileKey() != newState.getProfileKey()) { if (!oldState.getProfileKey().equals(newState.getProfileKey())) {
builder.addModifiedProfileKeys(newState); 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 @Test
public void to_admin() { public void to_admin() {
UUID uuid = UUID.randomUUID(); UUID uuid = UUID.randomUUID();
DecryptedGroup from = DecryptedGroup.newBuilder().addMembers(member(uuid)).build(); ProfileKey profileKey = randomProfileKey();
DecryptedGroup to = DecryptedGroup.newBuilder().addMembers(admin(uuid)).build(); 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); DecryptedGroupChange decryptedGroupChange = GroupChangeReconstruct.reconstructGroupChange(from, to);
@ -219,9 +220,10 @@ public final class GroupChangeReconstructTest {
@Test @Test
public void to_member() { public void to_member() {
UUID uuid = UUID.randomUUID(); UUID uuid = UUID.randomUUID();
DecryptedGroup from = DecryptedGroup.newBuilder().addMembers(admin(uuid)).build(); ProfileKey profileKey = randomProfileKey();
DecryptedGroup to = DecryptedGroup.newBuilder().addMembers(member(uuid)).build(); 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); DecryptedGroupChange decryptedGroupChange = GroupChangeReconstruct.reconstructGroupChange(from, to);