From cd29c96a8936ab94bbbe1d7fcd34fc26537a43b2 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Fri, 13 Feb 2026 08:15:18 -0800
Subject: [PATCH] Handle Envelope.serverGuidBinary

---
 ts/textsecure/MessageReceiver.preload.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ts/textsecure/MessageReceiver.preload.ts b/ts/textsecure/MessageReceiver.preload.ts
index 459368aa0b..959ce0952a 100644
--- a/ts/textsecure/MessageReceiver.preload.ts
+++ b/ts/textsecure/MessageReceiver.preload.ts
@@ -453,7 +453,12 @@ export default class MessageReceiver
           ),
           timestamp: decoded.clientTimestamp?.toNumber() ?? 0,
           content,
-          serverGuid: decoded.serverGuid ?? getGuid(),
+          serverGuid:
+            (Bytes.isNotEmpty(decoded.serverGuidBinary)
+              ? bytesToUuid(decoded.serverGuidBinary)
+              : undefined) ??
+            decoded.serverGuid ??
+            getGuid(),
           serverTimestamp,
           urgent: isBoolean(decoded.urgent) ? decoded.urgent : true,
           story: decoded.story ?? false,