From b44a502093f53fc86428cd2c3c227ae0d18ee73f Mon Sep 17 00:00:00 2001
From: Ruben De Smet <ruben.de.smet@rubdos.be>
Date: Sun, 22 Dec 2024 21:41:58 +0100
Subject: [PATCH] Bump protobuf spec

---
 protobuf/Groups.proto        |  1 +
 protobuf/Provisioning.proto  |  9 ++++++---
 protobuf/SignalService.proto | 14 ++++++++++++--
 protobuf/update-protos.sh    |  4 ++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/protobuf/Groups.proto b/protobuf/Groups.proto
index 63970c774..e202eb2aa 100644
--- a/protobuf/Groups.proto
+++ b/protobuf/Groups.proto
@@ -183,6 +183,7 @@ message GroupChange {
     }
 
              bytes                                      sourceServiceId                 = 1;
+             bytes                                      groupId                         = 25; // Only set when receiving from server
              uint32                                     revision                        = 2;
     repeated AddMemberAction                            addMembers                      = 3;
     repeated DeleteMemberAction                         deleteMembers                   = 4;
diff --git a/protobuf/Provisioning.proto b/protobuf/Provisioning.proto
index 2b9bef426..e18829a66 100644
--- a/protobuf/Provisioning.proto
+++ b/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 {
@@ -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 {
diff --git a/protobuf/SignalService.proto b/protobuf/SignalService.proto
index c16f9b24a..dc3166c42 100644
--- a/protobuf/SignalService.proto
+++ b/protobuf/SignalService.proto
@@ -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 {
@@ -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 {
@@ -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;
@@ -725,6 +734,7 @@ message SyncMessage {
   optional CallLinkUpdate         callLinkUpdate         = 20;
   optional CallLogEvent           callLogEvent           = 21;
   optional DeleteForMe            deleteForMe            = 22;
+  optional DeviceNameChange       deviceNameChange       = 23;
 }
 
 message AttachmentPointer {
diff --git a/protobuf/update-protos.sh b/protobuf/update-protos.sh
index 741525398..c79699ce2 100755
--- a/protobuf/update-protos.sh
+++ b/protobuf/update-protos.sh
@@ -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}