signalmeow: update protobufs

mautrix · Dec 2, 2024 · 39116d9 · 39116d9
1 parent 958aa33
commit 39116d9
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 35 deletions.
diff --git a/pkg/signalmeow/protobuf/Provisioning.pb.go b/pkg/signalmeow/protobuf/Provisioning.pb.go
diff --git a/pkg/signalmeow/protobuf/Provisioning.pb.raw b/pkg/signalmeow/protobuf/Provisioning.pb.raw
diff --git a/pkg/signalmeow/protobuf/Provisioning.proto b/pkg/signalmeow/protobuf/Provisioning.proto
@@ -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 {

diff --git a/pkg/signalmeow/protobuf/SignalService.pb.go b/pkg/signalmeow/protobuf/SignalService.pb.go
diff --git a/pkg/signalmeow/protobuf/SignalService.proto b/pkg/signalmeow/protobuf/SignalService.proto
@@ -546,9 +546,10 @@ message SyncMessage {
   message Keys {
     // @deprecated
     optional bytes storageService = 1;
-    optional bytes master         = 2;
-    optional string accountEntropyPool = 3; // Copied manually from Signal Desktop
-    optional bytes mediaRootBackupKey = 4; // Copied manually from Signal Desktop
+    // @deprecated
+    optional bytes master = 2;
+    optional string accountEntropyPool = 3;
+    optional bytes mediaRootBackupKey = 4;
   }
 
   message MessageRequestResponse {

diff --git a/pkg/signalmeow/protobuf/StorageService.pb.go b/pkg/signalmeow/protobuf/StorageService.pb.go
diff --git a/pkg/signalmeow/protobuf/StorageService.pb.raw b/pkg/signalmeow/protobuf/StorageService.pb.raw
diff --git a/pkg/signalmeow/protobuf/StorageService.proto b/pkg/signalmeow/protobuf/StorageService.proto
@@ -60,9 +60,8 @@ message ManifestRecord {
            uint64     version      = 1;
            uint32     sourceDevice = 3;
   repeated Identifier identifiers  = 2;
-  // Next ID: 4
-
-  optional bytes recordIkm = 4; // Copied manually from Signal Desktop
+           bytes      recordIkm    = 4;
+  // Next ID: 5
 }
 
 message StorageRecord {

diff --git a/pkg/signalmeow/protobuf/update-protos.sh b/pkg/signalmeow/protobuf/update-protos.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -euo pipefail
 
-ANDROID_GIT_REVISION=${1:-aad2624bd551c122a8938c12fe2d2240c950b8f4}
-DESKTOP_GIT_REVISION=${1:-ac09a508f1085c58afdeb6c758ccb22ab8ed8e51}
+ANDROID_GIT_REVISION=${1:-f5a68aa7aeccba3efba71e9868475a2483c5fa28}
+DESKTOP_GIT_REVISION=${1:-5d899d740b236491d8cad6fe187bb9806ff95ccf}
 
 update_proto() {
   case "$1" in

diff --git a/pkg/signalmeow/provisioning.go b/pkg/signalmeow/provisioning.go
@@ -279,7 +279,7 @@ func startProvisioning(ctx context.Context, ws *websocket.Conn, provisioningCiph
 		return "", fmt.Errorf("unexpected websocket message: %v", msg)
 	}
 
-	var provisioningBody signalpb.ProvisioningUuid
+	var provisioningBody signalpb.ProvisioningAddress
 	err = proto.Unmarshal(msg.GetRequest().GetBody(), &provisioningBody)
 	if err != nil {
 		return "", fmt.Errorf("failed to unmarshal provisioning UUID: %w", err)
@@ -289,8 +289,9 @@ func startProvisioning(ctx context.Context, ws *websocket.Conn, provisioningCiph
 		Scheme: "sgnl",
 		Host:   "linkdevice",
 		RawQuery: url.Values{
-			"uuid":    []string{provisioningBody.GetUuid()},
-			"pub_key": []string{base64.StdEncoding.EncodeToString(exerrors.Must(pubKey.Serialize()))},
+			"uuid":         []string{provisioningBody.GetAddress()},
+			"pub_key":      []string{base64.StdEncoding.EncodeToString(exerrors.Must(pubKey.Serialize()))},
+			"capabilities": []string{""}, // Will contain "backup" in the future
 		}.Encode(),
 	}).String()