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

Rename Groups.proto modifyMemberLabel field to modifyMemberLabels.

Browse Source
This commit is contained in:
jeffrey-signal
2026-01-30 12:12:52 -05:00
committed by Greyson Parrelli
parent 99d9c670b6
commit 028242826e
15 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java
View File

@@ -977,7 +977,7 @@ public final class DecryptedGroupUtil_apply_Test {
new DecryptedGroupChange.Builder()
.revision(11)
.modifyMemberLabel(List.of(modifyLabelAction))
.modifyMemberLabels(List.of(modifyLabelAction))
.build()
);
@@ -1019,7 +1019,7 @@ public final class DecryptedGroupUtil_apply_Test {
new DecryptedGroupChange.Builder()
.revision(11)
.modifyMemberLabel(List.of(modifyLabelAction))
.modifyMemberLabels(List.of(modifyLabelAction))
.build());
DecryptedGroup expectedResult = new DecryptedGroup.Builder()
@@ -1049,7 +1049,7 @@ public final class DecryptedGroupUtil_apply_Test {
.build(),
new DecryptedGroupChange.Builder()
.revision(11)
.modifyMemberLabel(List.of(modifyLabelAction))
.modifyMemberLabels(List.of(modifyLabelAction))
.build());
}
}

2
lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_empty_Test.java
View File

@@ -277,7 +277,7 @@ public final class DecryptedGroupUtil_empty_Test {
.build();
DecryptedGroupChange change = new DecryptedGroupChange.Builder()
.modifyMemberLabel(List.of(modifyLabelAction))
.modifyMemberLabels(List.of(modifyLabelAction))
.build();
assertFalse(DecryptedGroupUtil.changeIsEmpty(change));

16
lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java
View File

@@ -431,10 +431,10 @@ public final class GroupChangeReconstructTest {
DecryptedGroupChange change = GroupChangeReconstruct.reconstructGroupChange(from, to);
assertEquals(1, change.modifyMemberLabel.size());
assertEquals(UuidUtil.toByteString(memberUuid), change.modifyMemberLabel.get(0).aciBytes);
assertEquals("🎉", change.modifyMemberLabel.get(0).labelEmoji);
assertEquals("New Label", change.modifyMemberLabel.get(0).labelString);
assertEquals(1, change.modifyMemberLabels.size());
assertEquals(UuidUtil.toByteString(memberUuid), change.modifyMemberLabels.get(0).aciBytes);
assertEquals("🎉", change.modifyMemberLabels.get(0).labelEmoji);
assertEquals("New Label", change.modifyMemberLabels.get(0).labelString);
}
@Test
@@ -457,9 +457,9 @@ public final class GroupChangeReconstructTest {
DecryptedGroupChange change = GroupChangeReconstruct.reconstructGroupChange(from, to);
assertEquals(1, change.modifyMemberLabel.size());
assertEquals(UuidUtil.toByteString(memberUuid), change.modifyMemberLabel.get(0).aciBytes);
assertEquals("", change.modifyMemberLabel.get(0).labelEmoji);
assertEquals("", change.modifyMemberLabel.get(0).labelString);
assertEquals(1, change.modifyMemberLabels.size());
assertEquals(UuidUtil.toByteString(memberUuid), change.modifyMemberLabels.get(0).aciBytes);
assertEquals("", change.modifyMemberLabels.get(0).labelEmoji);
assertEquals("", change.modifyMemberLabels.get(0).labelString);
}
}

2
lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_changeIsEmpty_Test.java
View File

@@ -231,7 +231,7 @@ public final class GroupChangeUtil_changeIsEmpty_Test {
@Test
public void not_empty_with_modify_member_label_field_26() {
GroupChange.Actions actions = new GroupChange.Actions.Builder()
.modifyMemberLabel(List.of(new GroupChange.Actions.ModifyMemberLabelAction()))
.modifyMemberLabels(List.of(new GroupChange.Actions.ModifyMemberLabelAction()))
.build();
assertFalse(GroupChangeUtil.changeIsEmpty(actions));

8
lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java
View File

@@ -878,11 +878,11 @@ public final class GroupChangeUtil_resolveConflict_Test {
.build();
DecryptedGroupChange conflictingChange = new DecryptedGroupChange.Builder()
.modifyMemberLabel(List.of(modifyLabelAction))
.modifyMemberLabels(List.of(modifyLabelAction))
.build();
DecryptedGroupChange.Builder resolvedActions = GroupChangeUtil.resolveConflict(existingGroup, conflictingChange);
assertTrue(resolvedActions.build().modifyMemberLabel.isEmpty());
assertTrue(resolvedActions.build().modifyMemberLabels.isEmpty());
}
@Test
@@ -902,10 +902,10 @@ public final class GroupChangeUtil_resolveConflict_Test {
.build();
DecryptedGroupChange conflictingChange = new DecryptedGroupChange.Builder()
.modifyMemberLabel(List.of(modifyLabelAction))
.modifyMemberLabels(List.of(modifyLabelAction))
.build();
DecryptedGroupChange.Builder resolved = GroupChangeUtil.resolveConflict(existingGroup, conflictingChange);
assertTrue(resolved.build().modifyMemberLabel.isEmpty());
assertTrue(resolved.build().modifyMemberLabels.isEmpty());
}
}

8
lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java
View File

@@ -697,11 +697,11 @@ public final class GroupChangeUtil_resolveConflict_decryptedOnly_Test {
.build();
DecryptedGroupChange conflictingChange = new DecryptedGroupChange.Builder()
.modifyMemberLabel(List.of(modifyLabelAction))
.modifyMemberLabels(List.of(modifyLabelAction))
.build();
DecryptedGroupChange.Builder resolved = GroupChangeUtil.resolveConflict(existingGroup, conflictingChange);
assertTrue(resolved.build().modifyMemberLabel.isEmpty());
assertTrue(resolved.build().modifyMemberLabels.isEmpty());
}
@Test
@@ -721,10 +721,10 @@ public final class GroupChangeUtil_resolveConflict_decryptedOnly_Test {
.build();
DecryptedGroupChange conflictingChange = new DecryptedGroupChange.Builder()
.modifyMemberLabel(List.of(modifyLabelAction))
.modifyMemberLabels(List.of(modifyLabelAction))
.build();
DecryptedGroupChange.Builder resolved = GroupChangeUtil.resolveConflict(existingGroup, conflictingChange);
assertTrue(resolved.build().modifyMemberLabel.isEmpty());
assertTrue(resolved.build().modifyMemberLabels.isEmpty());
}
}

2
lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java
View File

@@ -472,7 +472,7 @@ public final class GroupsV2Operations_decrypt_change_Test {
assertDecryption(
groupOperations.createChangeMemberLabel(aci, "Label Text", "🔥"),
new DecryptedGroupChange.Builder().modifyMemberLabel(List.of(modifyLabelAction))
new DecryptedGroupChange.Builder().modifyMemberLabels(List.of(modifyLabelAction))
);
}