Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-14 23:18:43 +00: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

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeActionsBuilderChangeSetModifier.kt
View File

@@ -111,7 +111,7 @@ internal class DecryptedGroupChangeActionsBuilderChangeSetModifier(private val r
}
override fun removeModifyMemberLabels(i: Int) {
result.modifyMemberLabel = result.modifyMemberLabel.removeIndex(i)
result.modifyMemberLabels = result.modifyMemberLabels.removeIndex(i)
}
private fun <T> List<T>.removeIndex(i: Int): List<T> {

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

@@ -338,7 +338,7 @@ public final class DecryptedGroupUtil {
applyPromotePendingPniAciMemberActions(builder, change.promotePendingPniAciMembers);
DecryptedGroupExtensionsKt.setModifyMemberLabelActions(builder, change.modifyMemberLabel);
DecryptedGroupExtensionsKt.setModifyMemberLabelActions(builder, change.modifyMemberLabels);
return builder.build();
}
@@ -753,7 +753,7 @@ public final class DecryptedGroupUtil {
change.newBannedMembers.size() == 0 && // field 22
change.deleteBannedMembers.size() == 0 && // field 23
change.promotePendingPniAciMembers.size() == 0 && // field 24
change.modifyMemberLabel.isEmpty(); // field 26
change.modifyMemberLabels.isEmpty(); // field 26
}
public static boolean changeIsEmptyExceptForBanChangesAndOptionalProfileKeyChanges(DecryptedGroupChange change) {
@@ -777,7 +777,7 @@ public final class DecryptedGroupUtil {
change.newDescription == null && // field 20
isEmpty(change.newIsAnnouncementGroup) && // field 21
change.promotePendingPniAciMembers.size() == 0 && // field 24
change.modifyMemberLabel.isEmpty(); // field 26
change.modifyMemberLabels.isEmpty(); // field 26
}
static boolean isEmpty(AccessControl.AccessRequired newAttributeAccess) {

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeActionsBuilderChangeSetModifier.kt
View File

@@ -102,7 +102,7 @@ internal class GroupChangeActionsBuilderChangeSetModifier(private val result: Gr
}
override fun removeModifyMemberLabels(i: Int) {
result.modifyMemberLabel = result.modifyMemberLabel.removeIndex(i)
result.modifyMemberLabels = result.modifyMemberLabels.removeIndex(i)
}
private fun <T> List<T>.removeIndex(i: Int): List<T> {

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

@@ -143,7 +143,7 @@ public final class GroupChangeReconstruct {
}
builder.modifyMemberRoles(modifiedMemberRoles);
builder.modifiedProfileKeys(modifiedProfileKeys);
builder.modifyMemberLabel(modifiedMemberLabels);
builder.modifyMemberLabels(modifiedMemberLabels);
if (fromState.accessControl == null || (toState.accessControl != null && !fromState.accessControl.addFromInviteLink.equals(toState.accessControl.addFromInviteLink))) {
if (toState.accessControl != null) {

4
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil.java
View File

@@ -51,7 +51,7 @@ public final class GroupChangeUtil {
change.add_members_banned.size() == 0 && // field 22
change.delete_members_banned.size() == 0 && // field 23
change.promote_members_pending_pni_aci_profile_key.size() == 0 && // field 24
change.modifyMemberLabel.isEmpty(); // field 26
change.modifyMemberLabels.isEmpty(); // field 26
}
/**
@@ -379,7 +379,7 @@ public final class GroupChangeUtil {
@Nonnull Map<ByteString, DecryptedMember> fullMembersByAci
)
{
List<DecryptedModifyMemberLabel> actions = conflictingChange.modifyMemberLabel;
List<DecryptedModifyMemberLabel> actions = conflictingChange.modifyMemberLabels;
for (int i = actions.size() - 1; i >= 0; i--) {
DecryptedModifyMemberLabel action = actions.get(i);

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

@@ -758,8 +758,8 @@ public final class GroupsV2Operations {
builder.promotePendingPniAciMembers(promotePendingPniAciMembers);
// Field 26
List<DecryptedModifyMemberLabel> modifyMemberLabels = new ArrayList<>(actions.modifyMemberLabel.size());
for (GroupChange.Actions.ModifyMemberLabelAction action : actions.modifyMemberLabel) {
List<DecryptedModifyMemberLabel> modifyMemberLabels = new ArrayList<>(actions.modifyMemberLabels.size());
for (GroupChange.Actions.ModifyMemberLabelAction action : actions.modifyMemberLabels) {
modifyMemberLabels.add(
new DecryptedModifyMemberLabel.Builder()
.aciBytes(decryptAciToBinary(action.userId))
@@ -768,7 +768,7 @@ public final class GroupsV2Operations {
.build()
);
}
builder.modifyMemberLabel(modifyMemberLabels);
builder.modifyMemberLabels(modifyMemberLabels);
if (editorServiceId instanceof ServiceId.PNI) {
if (actions.addMembers.size() == 1 && builder.newMembers.size() == 1) {
@@ -1098,7 +1098,7 @@ public final class GroupsV2Operations {
}
public GroupChange.Actions.Builder createChangeMemberLabel(@Nonnull ACI memberAci, @Nonnull String labelString, @Nullable String labelEmoji) {
return new GroupChange.Actions.Builder().modifyMemberLabel(
return new GroupChange.Actions.Builder().modifyMemberLabels(
Collections.singletonList(
new GroupChange.Actions.ModifyMemberLabelAction.Builder()
.userId(encryptServiceId(memberAci))

2
lib/libsignal-service/src/main/protowire/DecryptedGroups.proto
View File

@@ -110,7 +110,7 @@ message DecryptedGroupChange {
repeated DecryptedBannedMember newBannedMembers = 22;
repeated DecryptedBannedMember deleteBannedMembers = 23;
repeated DecryptedMember promotePendingPniAciMembers = 24;
repeated DecryptedModifyMemberLabel modifyMemberLabel = 26;
repeated DecryptedModifyMemberLabel modifyMemberLabels = 26;
}
message DecryptedString {

2
lib/libsignal-service/src/main/protowire/Groups.proto
View File

@@ -261,7 +261,7 @@ message GroupChange {
repeated AddMemberBannedAction add_members_banned = 22; // change epoch = 4
repeated DeleteMemberBannedAction delete_members_banned = 23; // change epoch = 4
repeated PromoteMemberPendingPniAciProfileKeyAction promote_members_pending_pni_aci_profile_key = 24; // change epoch = 5
repeated ModifyMemberLabelAction modifyMemberLabel = 26; // change epoch = 6;
repeated ModifyMemberLabelAction modifyMemberLabels = 26; // change epoch = 6;
// next: 27
}

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))
);
}