Handle Envelope.serverGuidBinary

2026-02-20 17:59:47 +00:00 · 2026-02-13 08:15:18 -08:00
parent 5655b0d502
commit cd29c96a89
1 changed files with 6 additions and 1 deletions
--- 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,