mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-24 13:08:46 +00:00
Remove support for legacy gv1 sync messages.
This commit is contained in:
Greyson Parrelli
committed by
Nicholas
Nicholas
parent
25779d04a6
commit
3a5e5364c7
@@ -658,8 +658,6 @@ public class SignalServiceMessageSender {
|
||||
|
||||
if (message.getContacts().isPresent()) {
|
||||
content = createMultiDeviceContactsContent(message.getContacts().get().getContactsStream().asStream(), message.getContacts().get().isComplete());
|
||||
} else if (message.getGroups().isPresent()) {
|
||||
content = createMultiDeviceGroupsContent(message.getGroups().get().asStream());
|
||||
} else if (message.getRead().isPresent()) {
|
||||
content = createMultiDeviceReadContent(message.getRead().get());
|
||||
urgent = true;
|
||||
@@ -1304,16 +1302,6 @@ public class SignalServiceMessageSender {
|
||||
return container.setSyncMessage(builder).build();
|
||||
}
|
||||
|
||||
private Content createMultiDeviceGroupsContent(SignalServiceAttachmentStream groups) throws IOException {
|
||||
Content.Builder container = Content.newBuilder();
|
||||
SyncMessage.Builder builder = createSyncMessageBuilder();
|
||||
|
||||
builder.setGroups(SyncMessage.Groups.newBuilder()
|
||||
.setBlob(createAttachmentPointer(groups)));
|
||||
|
||||
return container.setSyncMessage(builder).build();
|
||||
}
|
||||
|
||||
private Content createMultiDeviceSentTranscriptContent(SentTranscriptMessage transcript, boolean unidentifiedAccess) throws IOException {
|
||||
SignalServiceAddress address = transcript.getDestination().get();
|
||||
Content content = createMessageContent(transcript);
|
||||
|
||||
@@ -28,10 +28,6 @@ public class RequestMessage {
|
||||
return request.getType() == Request.Type.CONTACTS;
|
||||
}
|
||||
|
||||
public boolean isGroupsRequest() {
|
||||
return request.getType() == Request.Type.GROUPS;
|
||||
}
|
||||
|
||||
public boolean isBlockedListRequest() {
|
||||
return request.getType() == Request.Type.BLOCKED;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,6 @@ public class SignalServiceSyncMessage {
|
||||
|
||||
private final Optional<SentTranscriptMessage> sent;
|
||||
private final Optional<ContactsMessage> contacts;
|
||||
private final Optional<SignalServiceAttachment> groups;
|
||||
private final Optional<BlockedListMessage> blockedList;
|
||||
private final Optional<RequestMessage> request;
|
||||
private final Optional<List<ReadMessage>> reads;
|
||||
@@ -40,7 +39,6 @@ public class SignalServiceSyncMessage {
|
||||
|
||||
private SignalServiceSyncMessage(Optional<SentTranscriptMessage> sent,
|
||||
Optional<ContactsMessage> contacts,
|
||||
Optional<SignalServiceAttachment> groups,
|
||||
Optional<BlockedListMessage> blockedList,
|
||||
Optional<RequestMessage> request,
|
||||
Optional<List<ReadMessage>> reads,
|
||||
@@ -58,7 +56,6 @@ public class SignalServiceSyncMessage {
|
||||
{
|
||||
this.sent = sent;
|
||||
this.contacts = contacts;
|
||||
this.groups = groups;
|
||||
this.blockedList = blockedList;
|
||||
this.request = request;
|
||||
this.reads = reads;
|
||||
@@ -91,7 +88,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
}
|
||||
|
||||
@@ -111,33 +107,11 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
}
|
||||
|
||||
public static SignalServiceSyncMessage forGroups(SignalServiceAttachment groups) {
|
||||
return new SignalServiceSyncMessage(Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(groups),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
}
|
||||
|
||||
public static SignalServiceSyncMessage forRequest(RequestMessage request) {
|
||||
return new SignalServiceSyncMessage(Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(request),
|
||||
@@ -160,7 +134,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(reads),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
@@ -189,7 +162,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(views),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
@@ -201,7 +173,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(timerRead),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
@@ -223,7 +194,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(reads),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
@@ -245,7 +215,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(verifiedMessage),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
@@ -260,7 +229,6 @@ public class SignalServiceSyncMessage {
|
||||
|
||||
public static SignalServiceSyncMessage forBlocked(BlockedListMessage blocked) {
|
||||
return new SignalServiceSyncMessage(Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(blocked),
|
||||
Optional.empty(),
|
||||
@@ -286,7 +254,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(configuration),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
@@ -307,7 +274,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(stickerPackOperations),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
@@ -328,7 +294,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(fetchType),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
@@ -349,7 +314,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(keys),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
@@ -370,7 +334,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(messageRequestResponse),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
@@ -391,7 +354,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(outgoingPaymentMessage),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
@@ -413,7 +375,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(callEvent),
|
||||
Optional.empty());
|
||||
}
|
||||
@@ -434,7 +395,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.of(callLinkUpdate));
|
||||
}
|
||||
|
||||
@@ -454,7 +414,6 @@ public class SignalServiceSyncMessage {
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
}
|
||||
|
||||
@@ -462,10 +421,6 @@ public class SignalServiceSyncMessage {
|
||||
return sent;
|
||||
}
|
||||
|
||||
public Optional<SignalServiceAttachment> getGroups() {
|
||||
return groups;
|
||||
}
|
||||
|
||||
public Optional<ContactsMessage> getContacts() {
|
||||
return contacts;
|
||||
}
|
||||
|
||||
@@ -479,10 +479,6 @@ message SyncMessage {
|
||||
optional bool complete = 2 [default = false];
|
||||
}
|
||||
|
||||
message Groups {
|
||||
optional AttachmentPointer blob = 1;
|
||||
}
|
||||
|
||||
message Blocked {
|
||||
repeated string numbers = 1;
|
||||
repeated string uuids = 3;
|
||||
@@ -493,7 +489,7 @@ message SyncMessage {
|
||||
enum Type {
|
||||
UNKNOWN = 0;
|
||||
CONTACTS = 1;
|
||||
GROUPS = 2;
|
||||
// GROUPS = 2;
|
||||
BLOCKED = 3;
|
||||
CONFIGURATION = 4;
|
||||
KEYS = 5;
|
||||
@@ -636,7 +632,7 @@ message SyncMessage {
|
||||
|
||||
optional Sent sent = 1;
|
||||
optional Contacts contacts = 2;
|
||||
optional Groups groups = 3;
|
||||
reserved /*groups*/ 3;
|
||||
optional Request request = 4;
|
||||
repeated Read read = 5;
|
||||
optional Blocked blocked = 6;
|
||||
|
||||
Reference in New Issue
Block a user