Remove UUIDs from GV1 membership lists.

This commit is contained in:
Greyson Parrelli
2020-07-27 16:37:08 -04:00
parent 1ab61beeb9
commit 5c110ca359
10 changed files with 60 additions and 59 deletions

View File

@@ -1060,19 +1060,12 @@ public class SignalServiceMessageSender {
for (SignalServiceAddress address : group.getMembers().get()) {
if (address.getNumber().isPresent()) {
builder.addMembersE164(address.getNumber().get());
}
GroupContext.Member.Builder memberBuilder = GroupContext.Member.newBuilder();
if (address.getUuid().isPresent()) {
memberBuilder.setUuid(address.getUuid().get().toString());
}
if (address.getNumber().isPresent()) {
GroupContext.Member.Builder memberBuilder = GroupContext.Member.newBuilder();
memberBuilder.setE164(address.getNumber().get());
}
builder.addMembers(memberBuilder.build());
builder.addMembers(memberBuilder.build());
}
}
}

View File

@@ -873,8 +873,8 @@ public final class SignalServiceContent {
members = new ArrayList<>(content.getGroup().getMembersCount());
for (SignalServiceProtos.GroupContext.Member member : content.getGroup().getMembersList()) {
if (SignalServiceAddress.isValidAddress(member.getUuid(), member.getE164())) {
members.add(new SignalServiceAddress(UuidUtil.parseOrNull(member.getUuid()), member.getE164()));
if (SignalServiceAddress.isValidAddress(null, member.getE164())) {
members.add(new SignalServiceAddress(null, member.getE164()));
} else {
throw new ProtocolInvalidMessageException(new InvalidMessageException("GroupContext.Member had no address!"), null, 0);
}

View File

@@ -61,8 +61,8 @@ public class DeviceGroupsInputStream extends ChunkedInputStream{
List<SignalServiceAddress> addressMembers = new ArrayList<>(members.size());
for (GroupDetails.Member member : members) {
if (SignalServiceAddress.isValidAddress(member.getUuid(), member.getE164())) {
addressMembers.add(new SignalServiceAddress(UuidUtil.parseOrNull(member.getUuid()), member.getE164()));
if (SignalServiceAddress.isValidAddress(null, member.getE164())) {
addressMembers.add(new SignalServiceAddress(null, member.getE164()));
} else {
throw new IOException("Missing group member address!");
}

View File

@@ -65,18 +65,13 @@ public class DeviceGroupsOutputStream extends ChunkedOutputStream {
List<String> membersE164 = new ArrayList<>(group.getMembers().size());
for (SignalServiceAddress address : group.getMembers()) {
GroupDetails.Member.Builder builder = GroupDetails.Member.newBuilder();
if (address.getUuid().isPresent()) {
builder.setUuid(address.getUuid().get().toString());
}
if (address.getNumber().isPresent()) {
builder.setE164(address.getNumber().get());
membersE164.add(address.getNumber().get());
}
members.add(builder.build());
GroupDetails.Member.Builder builder = GroupDetails.Member.newBuilder();
builder.setE164(address.getNumber().get());
members.add(builder.build());
}
}
groupDetails.addAllMembers(members);

View File

@@ -435,7 +435,7 @@ message GroupContext {
}
message Member {
optional string uuid = 1;
// 1 is reserved
optional string e164 = 2;
}
@@ -479,7 +479,7 @@ message GroupDetails {
}
message Member {
optional string uuid = 1;
// 1 is reserved
optional string e164 = 2;
}