From 6a37c2cb0ced0c40949355d3ffa3f79aacc38800 Mon Sep 17 00:00:00 2001
From: jack <no@no.no>
Date: Sun, 6 Jul 2025 22:05:06 +0200
Subject: [PATCH] Fix message ID not being preserved during decoding

- Fixed BinaryProtocol to actually read and use the message ID
- Pass the decoded ID to BitchatMessage constructor
- This ensures ACKs reference the correct original message ID
---
 bitchat/Protocols/BinaryProtocol.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bitchat/Protocols/BinaryProtocol.swift b/bitchat/Protocols/BinaryProtocol.swift
index a19e33c2..3df5d9e3 100644
--- a/bitchat/Protocols/BinaryProtocol.swift
+++ b/bitchat/Protocols/BinaryProtocol.swift
@@ -376,7 +376,7 @@ extension BitchatMessage {
         guard offset + idLength <= dataCopy.count else { 
             return nil 
         }
-        let _ = String(data: dataCopy[offset..<offset+idLength], encoding: .utf8) ?? UUID().uuidString
+        let id = String(data: dataCopy[offset..<offset+idLength], encoding: .utf8) ?? UUID().uuidString
         offset += idLength
         
         // Sender
@@ -476,6 +476,7 @@ extension BitchatMessage {
         }
         
         let message = BitchatMessage(
+            id: id,
             sender: sender,
             content: content,
             timestamp: timestamp,