Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump protobuf spec #349

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump protobuf spec #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions protobuf/Groups.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ message GroupChange {
}

bytes sourceServiceId = 1;
bytes groupId = 25; // Only set when receiving from server
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds like we should use this 🤔

uint32 revision = 2;
repeated AddMemberAction addMembers = 3;
repeated DeleteMemberAction deleteMembers = 4;
Expand Down
9 changes: 6 additions & 3 deletions protobuf/Provisioning.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ package signalservice;
option java_package = "org.whispersystems.signalservice.internal.push";
option java_outer_classname = "ProvisioningProtos";

message ProvisioningUuid {
optional string uuid = 1;
message ProvisioningAddress {
optional string address = 1;
}

message ProvisionEnvelope {
Expand All @@ -33,7 +33,10 @@ message ProvisionMessage {
optional bool readReceipts = 7;
optional uint32 provisioningVersion = 9;
optional bytes masterKey = 13;
// NEXT ID: 14
optional bytes ephemeralBackupKey = 14; // 32 bytes
optional string accountEntropyPool = 15;
optional bytes mediaRootBackupKey = 16; // 32-bytes
// NEXT ID: 17
}

enum ProvisioningVersion {
Expand Down
14 changes: 12 additions & 2 deletions protobuf/SignalService.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ message DataMessage {
optional string prefix = 3;
optional string suffix = 4;
optional string middleName = 5;
optional string displayName = 6;
reserved /*displayName*/ 6;
optional string nickname = 7;
}

message Phone {
Expand Down Expand Up @@ -545,7 +546,10 @@ message SyncMessage {
message Keys {
// @deprecated
optional bytes storageService = 1;
optional bytes master = 2;
// @deprecated
optional bytes master = 2;
optional string accountEntropyPool = 3;
optional bytes mediaRootBackupKey = 4;
}

message MessageRequestResponse {
Expand Down Expand Up @@ -703,6 +707,11 @@ message SyncMessage {
repeated AttachmentDelete attachmentDeletes = 4;
}

message DeviceNameChange {
reserved /*name*/ 1;
optional uint32 deviceId = 2;
}

optional Sent sent = 1;
optional Contacts contacts = 2;
reserved /*groups*/ 3;
Expand All @@ -725,6 +734,7 @@ message SyncMessage {
optional CallLinkUpdate callLinkUpdate = 20;
optional CallLogEvent callLogEvent = 21;
optional DeleteForMe deleteForMe = 22;
optional DeviceNameChange deviceNameChange = 23;
}

message AttachmentPointer {
Expand Down
4 changes: 2 additions & 2 deletions protobuf/update-protos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set -euo pipefail
update_proto() {
case "$1" in
Signal-Android)
git_revision="6188502cb10e46f1741af9a8da737715b9fd6e22"
git_revision="ba79a3e83e8dee71a33c0cc846809d5b648c2c88"
prefix="libsignal-service/src/main/protowire/";;
Signal-Desktop)
git_revision="94cb1544e5b5e6c4803aea5295066add2b9cf17c"
git_revision="82694f19260a5eee4a29dfbe83e4c64c78694e65"
prefix="protos/";;
esac
curl -LOf https://raw.githubusercontent.com/signalapp/${1}/${git_revision}/${prefix}${2}
Expand Down
Loading