Resolve merge conflicts in ChatViewModel.swift (geohash sampling comments and removed background nudge)

bitchat/Nostr/NostrRelayManager.swift

@@ -44,15 +44,8 @@ class NostrRelayManager: ObservableObject {
     private var cancellables = Set<AnyCancellable>()
     
     // Message queue for reliability
-    // Pending sends held only for relays that are not yet connected.
-    private struct PendingSend {
-        var event: NostrEvent
-        var pendingRelays: Set<String>
-    }
-    private var messageQueue: [PendingSend] = []
+    private var messageQueue: [(event: NostrEvent, relayUrls: [String])] = []
     private let messageQueueLock = NSLock()
-    private let encoder = JSONEncoder()
-    private let decoder = JSONDecoder()
     
     // Exponential backoff configuration
     private let initialBackoffInterval: TimeInterval = TransportConfig.nostrRelayInitialBackoffSeconds
@@ -66,8 +59,6 @@ class NostrRelayManager: ObservableObject {
     init() {
         // Initialize with default relays
         self.relays = Self.defaultRelays.map { Relay(url: $0) }
-        // Deterministic JSON shape for outbound requests
-        self.encoder.outputFormatting = .sortedKeys
     }
     
     /// Connect to all configured relays
@@ -104,57 +95,16 @@ class NostrRelayManager: ObservableObject {
     func sendEvent(_ event: NostrEvent, to relayUrls: [String]? = nil) {
         let targetRelays = relayUrls ?? Self.defaultRelays
         ensureConnections(to: targetRelays)
-
-        // Attempt immediate send to relays with active connections; queue the rest
-        var stillPending = Set<String>()
+        
+        // Add to queue for reliability
+        messageQueueLock.lock()
+        messageQueue.append((event, targetRelays))
+        messageQueueLock.unlock()
+        
+        // Attempt immediate send
         for relayUrl in targetRelays {
             if let connection = connections[relayUrl] {
                 sendToRelay(event: event, connection: connection, relayUrl: relayUrl)
-            } else {
-                stillPending.insert(relayUrl)
-            }
-        }
-        if !stillPending.isEmpty {
-            messageQueueLock.lock()
-            messageQueue.append(PendingSend(event: event, pendingRelays: stillPending))
-            messageQueueLock.unlock()
-        }
-    }
-
-    /// Try to flush any queued messages for relays that are now connected.
-    private func flushMessageQueue(for relayUrl: String? = nil) {
-        messageQueueLock.lock()
-        defer { messageQueueLock.unlock() }
-        guard !messageQueue.isEmpty else { return }
-        if let target = relayUrl {
-            // Flush only for a specific relay
-            for i in (0..<messageQueue.count).reversed() {
-                var item = messageQueue[i]
-                if item.pendingRelays.contains(target), let conn = connections[target] {
-                    sendToRelay(event: item.event, connection: conn, relayUrl: target)
-                    item.pendingRelays.remove(target)
-                    if item.pendingRelays.isEmpty {
-                        messageQueue.remove(at: i)
-                    } else {
-                        messageQueue[i] = item
-                    }
-                }
-            }
-        } else {
-            // Flush for any relays that now have connections
-            for i in (0..<messageQueue.count).reversed() {
-                var item = messageQueue[i]
-                for url in item.pendingRelays {
-                    if let conn = connections[url] {
-                        sendToRelay(event: item.event, connection: conn, relayUrl: url)
-                        item.pendingRelays.remove(url)
-                    }
-                }
-                if item.pendingRelays.isEmpty {
-                    messageQueue.remove(at: i)
-                } else {
-                    messageQueue[i] = item
-                }
             }
         }
     }
@@ -174,6 +124,8 @@ class NostrRelayManager: ObservableObject {
         let req = NostrRequest.subscribe(id: id, filters: [filter])
         
         do {
+            let encoder = JSONEncoder()
+            encoder.outputFormatting = .sortedKeys // For consistent output
             let message = try encoder.encode(req)
             guard let messageString = String(data: message, encoding: .utf8) else { 
                 SecureLogger.log("❌ Failed to encode subscription request", category: SecureLogger.session, level: .error)
@@ -223,7 +175,7 @@ class NostrRelayManager: ObservableObject {
         messageHandlers.removeValue(forKey: id)
         
         let req = NostrRequest.close(id: id)
-        let message = try? encoder.encode(req)
+        let message = try? JSONEncoder().encode(req)
         
         guard let messageData = message,
               let messageString = String(data: messageData, encoding: .utf8) else { return }
@@ -290,21 +242,14 @@ class NostrRelayManager: ObservableObject {
             case .success(let message):
                 switch message {
                 case .string(let text):
-                    // Parse off-main to reduce UI jank, then hop back for state updates
-                    Task.detached(priority: .utility) {
-                        guard let parsed = parseInboundMessage(text) else { return }
-                        await MainActor.run {
-                            NostrRelayManager.shared.handleParsedMessage(parsed, from: relayUrl)
-                        }
+                    Task { @MainActor in
+                        self.handleMessage(text, from: relayUrl)
                     }
                 case .data(let data):
                     if let text = String(data: data, encoding: .utf8) {
-                        Task.detached(priority: .utility) {
-                            guard let parsed = parseInboundMessage(text) else { return }
-                            await MainActor.run {
-                                NostrRelayManager.shared.handleParsedMessage(parsed, from: relayUrl)
-                            }
-                        }
+                        Task { @MainActor in
+                        self.handleMessage(text, from: relayUrl)
+                    }
                     }
                 @unknown default:
                     break
@@ -323,42 +268,79 @@ class NostrRelayManager: ObservableObject {
         }
     }
     
-    // Parsed inbound message type (off-main)
-    // Note: declared at file scope below to avoid MainActor isolation inside this class
-    // and keep parsing off the main actor.
-
-    // Handle parsed message on MainActor (state updates and handlers)
-    private func handleParsedMessage(_ parsed: ParsedInbound, from relayUrl: String) {
-        switch parsed {
-        case .event(let subId, let event):
-            if event.kind != 1059 {
-                SecureLogger.log("📥 Event kind=\(event.kind) id=\(event.id.prefix(16))… relay=\(relayUrl)",
-                                category: SecureLogger.session, level: .debug)
+    private func handleMessage(_ message: String, from relayUrl: String) {
+        guard let data = message.data(using: .utf8) else { return }
+        
+        do {
+            // Try to decode as an array first
+            if let array = try JSONSerialization.jsonObject(with: data) as? [Any],
+               array.count >= 2,
+               let type = array[0] as? String {
+                
+                // Received message from relay
+                
+                switch type {
+                case "EVENT":
+                    if array.count >= 3,
+                       let subId = array[1] as? String,
+                       let eventDict = array[2] as? [String: Any] {
+                        
+                        let event = try NostrEvent(from: eventDict)
+                        
+                        // Only log non-gift-wrap events to reduce noise
+                        if event.kind != 1059 {
+                            SecureLogger.log("📥 Event kind=\(event.kind) id=\(event.id.prefix(16))… relay=\(relayUrl)",
+                                            category: SecureLogger.session, level: .debug)
+                        }
+                        
+                        DispatchQueue.main.async {
+                            // Update relay stats
+                            if let index = self.relays.firstIndex(where: { $0.url == relayUrl }) {
+                                self.relays[index].messagesReceived += 1
+                            }
+                            
+                            // Call handler
+                            if let handler = self.messageHandlers[subId] {
+                                handler(event)
+                            } else {
+                                SecureLogger.log("⚠️ No handler for subscription \(subId)", 
+                                                category: SecureLogger.session, level: .warning)
+                            }
+                        }
+                    }
+                    
+                case "EOSE":
+                    if array.count >= 2 {
+                        // End of stored events
+                    }
+                    
+                case "OK":
+                    if array.count >= 3,
+                       let eventId = array[1] as? String,
+                       let success = array[2] as? Bool {
+                        let reason = array.count >= 4 ? (array[3] as? String ?? "no reason given") : "no reason given"
+                        if success {
+                            _ = Self.pendingGiftWrapIDs.remove(eventId)
+                            SecureLogger.log("✅ Accepted id=\(eventId.prefix(16))… relay=\(relayUrl)",
+                                            category: SecureLogger.session, level: .debug)
+                        } else {
+                            let isGiftWrap = Self.pendingGiftWrapIDs.remove(eventId) != nil
+                            SecureLogger.log("📮 Rejected id=\(eventId.prefix(16))… reason=\(reason)", 
+                                            category: SecureLogger.session, level: isGiftWrap ? .warning : .error)
+                        }
+                    }
+                    
+                case "NOTICE":
+                    if array.count >= 2 {
+                        // Server notice received
+                    }
+                    
+                default:
+                    break // Unknown message type
+                }
             }
-            if let index = self.relays.firstIndex(where: { $0.url == relayUrl }) {
-                self.relays[index].messagesReceived += 1
-            }
-            if let handler = self.messageHandlers[subId] {
-                handler(event)
-            } else {
-                SecureLogger.log("⚠️ No handler for subscription \(subId)", 
-                                category: SecureLogger.session, level: .warning)
-            }
-        case .eose:
-            // No-op for now
-            break
-        case .ok(let eventId, let success, let reason):
-            if success {
-                _ = Self.pendingGiftWrapIDs.remove(eventId)
-                SecureLogger.log("✅ Accepted id=\(eventId.prefix(16))… relay=\(relayUrl)",
-                                category: SecureLogger.session, level: .debug)
-            } else {
-                let isGiftWrap = Self.pendingGiftWrapIDs.remove(eventId) != nil
-                SecureLogger.log("📮 Rejected id=\(eventId.prefix(16))… reason=\(reason)",
-                                category: SecureLogger.session, level: isGiftWrap ? .warning : .error)
-            }
-        case .notice:
-            break
+        } catch {
+            SecureLogger.log("Failed to parse Nostr message: \(error)", category: SecureLogger.session, level: .error)
         }
     }
     
@@ -366,6 +348,8 @@ class NostrRelayManager: ObservableObject {
         let req = NostrRequest.event(event)
         
         do {
+            let encoder = JSONEncoder()
+            encoder.outputFormatting = .sortedKeys
             let data = try encoder.encode(req)
             let message = String(data: data, encoding: .utf8) ?? ""
             
@@ -405,10 +389,6 @@ class NostrRelayManager: ObservableObject {
             }
         }
         updateConnectionStatus()
-        // If we just connected to this relay, flush any queued sends targeting it
-        if isConnected {
-            flushMessageQueue(for: url)
-        }
     }
     
     private func updateConnectionStatus() {
@@ -514,51 +494,6 @@ class NostrRelayManager: ObservableObject {
     }
 }
 
-// MARK: - Off-main inbound parsing helpers (file scope, non-isolated)
-
-private enum ParsedInbound {
-    case event(subId: String, event: NostrEvent)
-    case ok(eventId: String, success: Bool, reason: String)
-    case eose(subscriptionId: String)
-    case notice(String)
-}
-
-// Off-main JSON parse to avoid UI jank; pure function, not actor-isolated
-private func parseInboundMessage(_ message: String) -> ParsedInbound? {
-    guard let data = message.data(using: .utf8) else { return nil }
-    do {
-        if let array = try JSONSerialization.jsonObject(with: data) as? [Any],
-           array.count >= 2,
-           let type = array[0] as? String {
-            switch type {
-            case "EVENT":
-                if array.count >= 3,
-                   let subId = array[1] as? String,
-                   let eventDict = array[2] as? [String: Any] {
-                    let event = try NostrEvent(from: eventDict)
-                    return .event(subId: subId, event: event)
-                }
-            case "EOSE":
-                if let subId = array[1] as? String { return .eose(subscriptionId: subId) }
-            case "OK":
-                if array.count >= 3,
-                   let eventId = array[1] as? String,
-                   let success = array[2] as? Bool {
-                    let reason = array.count >= 4 ? (array[3] as? String ?? "no reason given") : "no reason given"
-                    return .ok(eventId: eventId, success: success, reason: reason)
-                }
-            case "NOTICE":
-                if array.count >= 2, let msg = array[1] as? String { return .notice(msg) }
-            default:
-                return nil
-            }
-        }
-    } catch {
-        // Ignore
-    }
-    return nil
-}
-
 // MARK: - Nostr Protocol Types
 
 enum NostrRequest: Encodable {

bitchat/Protocols/BinaryEncodingUtils.swift

@@ -40,23 +40,23 @@ extension Data {
 extension Data {
     // MARK: Writing
     
-    @inlinable mutating func appendUInt8(_ value: UInt8) {
+    mutating func appendUInt8(_ value: UInt8) {
         self.append(value)
     }
     
-    @inlinable mutating func appendUInt16(_ value: UInt16) {
+    mutating func appendUInt16(_ value: UInt16) {
         self.append(UInt8((value >> 8) & 0xFF))
         self.append(UInt8(value & 0xFF))
     }
     
-    @inlinable mutating func appendUInt32(_ value: UInt32) {
+    mutating func appendUInt32(_ value: UInt32) {
         self.append(UInt8((value >> 24) & 0xFF))
         self.append(UInt8((value >> 16) & 0xFF))
         self.append(UInt8((value >> 8) & 0xFF))
         self.append(UInt8(value & 0xFF))
     }
     
-    @inlinable mutating func appendUInt64(_ value: UInt64) {
+    mutating func appendUInt64(_ value: UInt64) {
         for i in (0..<8).reversed() {
             self.append(UInt8((value >> (i * 8)) & 0xFF))
         }
@@ -113,21 +113,21 @@ extension Data {
     
     // MARK: Reading
     
-    @inlinable func readUInt8(at offset: inout Int) -> UInt8? {
+    func readUInt8(at offset: inout Int) -> UInt8? {
         guard offset >= 0 && offset < self.count else { return nil }
         let value = self[offset]
         offset += 1
         return value
     }
     
-    @inlinable func readUInt16(at offset: inout Int) -> UInt16? {
+    func readUInt16(at offset: inout Int) -> UInt16? {
         guard offset + 2 <= self.count else { return nil }
         let value = UInt16(self[offset]) << 8 | UInt16(self[offset + 1])
         offset += 2
         return value
     }
     
-    @inlinable func readUInt32(at offset: inout Int) -> UInt32? {
+    func readUInt32(at offset: inout Int) -> UInt32? {
         guard offset + 4 <= self.count else { return nil }
         let value = UInt32(self[offset]) << 24 |
                    UInt32(self[offset + 1]) << 16 |
@@ -137,7 +137,7 @@ extension Data {
         return value
     }
     
-    @inlinable func readUInt64(at offset: inout Int) -> UInt64? {
+    func readUInt64(at offset: inout Int) -> UInt64? {
         guard offset + 8 <= self.count else { return nil }
         var value: UInt64 = 0
         for i in 0..<8 {
@@ -220,3 +220,4 @@ extension Data {
         return data
     }
 }
+

bitchat/Protocols/BinaryProtocol.swift

@@ -139,11 +139,6 @@ struct BinaryProtocol {
         }
         
         // Header
-        // Reserve capacity to reduce reallocations. Estimate base size conservatively.
-        // header(13) + sender(8) + opt recipient(8) + opt originalSize(2) + payload + opt signature(64) + up to 255 pad
-        let estimatedPayload = payload.count + (isCompressed ? 2 : 0)
-        let estimated = headerSize + senderIDSize + (packet.recipientID == nil ? 0 : recipientIDSize) + estimatedPayload + (packet.signature == nil ? 0 : signatureSize) + 255
-        data.reserveCapacity(estimated)
         data.append(packet.version)
         data.append(packet.type)
         data.append(packet.ttl)
@@ -227,105 +222,135 @@ struct BinaryProtocol {
 
     // Core decoding implementation used by decode(_:) with and without padding removal
     private static func decodeCore(_ raw: Data) -> BitchatPacket? {
-        // Minimum size: header + senderID
-        guard raw.count >= headerSize + senderIDSize else { return nil }
-
-        return raw.withUnsafeBytes { (buf: UnsafeRawBufferPointer) -> BitchatPacket? in
-            guard let base = buf.baseAddress else { return nil }
-            var offset = 0
-            func require(_ n: Int) -> Bool { offset + n <= buf.count }
-            // Read single byte
-            func read8() -> UInt8? {
-                guard require(1) else { return nil }
-                let v = base.advanced(by: offset).assumingMemoryBound(to: UInt8.self).pointee
-                offset += 1
-                return v
-            }
-            // Read big-endian 16-bit
-            func read16() -> UInt16? {
-                guard require(2) else { return nil }
-                let p = base.advanced(by: offset).assumingMemoryBound(to: UInt8.self)
-                let v = (UInt16(p[0]) << 8) | UInt16(p[1])
-                offset += 2
-                return v
-            }
-            // Copy N bytes into Data
-            func readData(_ n: Int) -> Data? {
-                guard require(n) else { return nil }
-                let ptr = base.advanced(by: offset)
-                let d = Data(bytes: ptr, count: n)
-                offset += n
-                return d
-            }
-
-            // Version
-            guard let version = read8(), version == 1 else { return nil }
-            guard let type = read8() else { return nil }
-            guard let ttl = read8() else { return nil }
-
-            // Timestamp 8 bytes BE
-            guard require(8) else { return nil }
-            var ts: UInt64 = 0
-            for _ in 0..<8 {
-                guard let b = read8() else { return nil }
-                ts = (ts << 8) | UInt64(b)
-            }
-
-            // Flags
-            guard let flags = read8() else { return nil }
-            let hasRecipient = (flags & Flags.hasRecipient) != 0
-            let hasSignature = (flags & Flags.hasSignature) != 0
-            let isCompressed = (flags & Flags.isCompressed) != 0
-
-            // Payload length
-            guard let payloadLen = read16(), payloadLen <= 65535 else { return nil }
-
-            // SenderID
-            guard let senderID = readData(senderIDSize) else { return nil }
-
-            // Recipient
-            var recipientID: Data? = nil
-            if hasRecipient {
-                recipientID = readData(recipientIDSize)
-                if recipientID == nil { return nil }
-            }
-
-            // Payload
-            let payload: Data
-            if isCompressed {
-                // Need original size (2 bytes)
-                guard let origSize16 = read16() else { return nil }
-                let originalSize = Int(origSize16)
-                guard originalSize >= 0 && originalSize <= 1_048_576 else { return nil }
-                let compSize = Int(payloadLen) - 2
-                guard compSize >= 0, let compressed = readData(compSize) else { return nil }
-                guard let decompressed = CompressionUtil.decompress(compressed, originalSize: originalSize),
-                      decompressed.count == originalSize else { return nil }
-                payload = decompressed
-            } else {
-                guard let p = readData(Int(payloadLen)) else { return nil }
-                payload = p
-            }
-
-            // Signature
-            var signature: Data? = nil
-            if hasSignature {
-                signature = readData(signatureSize)
-                if signature == nil { return nil }
-            }
-
-            guard offset <= buf.count else { return nil }
-
-            return BitchatPacket(
-                type: type,
-                senderID: senderID,
-                recipientID: recipientID,
-                timestamp: ts,
-                payload: payload,
-                signature: signature,
-                ttl: ttl
-            )
+        // Minimum size check: header + senderID
+        guard raw.count >= headerSize + senderIDSize else { 
+            return nil 
         }
+        
+        // Convert to array for safer indexed access
+        let dataArray = Array(raw)
+        var offset = 0
+        
+        // Header parsing with bounds checks
+        guard offset < dataArray.count else { return nil }
+        let version = dataArray[offset]; offset += 1
+        
+        // Check if version is 1 (only supported version)
+        guard version == 1 else { 
+            return nil 
+        }
+        
+        guard offset < dataArray.count else { return nil }
+        let type = dataArray[offset]; offset += 1
+        
+        guard offset < dataArray.count else { return nil }
+        let ttl = dataArray[offset]; offset += 1
+        
+        // Timestamp - need 8 bytes
+        guard offset + 8 <= dataArray.count else { return nil }
+        let timestampData = Data(dataArray[offset..<offset+8])
+        let timestamp = timestampData.reduce(0) { result, byte in
+            (result << 8) | UInt64(byte)
+        }
+        offset += 8
+        
+        // Flags
+        guard offset < dataArray.count else { return nil }
+        let flags = dataArray[offset]; offset += 1
+        let hasRecipient = (flags & Flags.hasRecipient) != 0
+        let hasSignature = (flags & Flags.hasSignature) != 0
+        let isCompressed = (flags & Flags.isCompressed) != 0
+        
+        // Payload length - need 2 bytes
+        guard offset + 2 <= dataArray.count else { return nil }
+        let payloadLengthData = Data(dataArray[offset..<offset+2])
+        let payloadLength = payloadLengthData.reduce(0) { result, byte in
+            (result << 8) | UInt16(byte)
+        }
+        offset += 2
+        
+        // Validate payloadLength is reasonable (prevent integer overflow)
+        guard payloadLength <= 65535 else { return nil }
+        
+        // SenderID - need 8 bytes
+        guard offset + senderIDSize <= dataArray.count else { return nil }
+        let senderID = Data(dataArray[offset..<offset+senderIDSize])
+        offset += senderIDSize
+        
+        // RecipientID if present
+        var recipientID: Data?
+        if hasRecipient {
+            guard offset + recipientIDSize <= dataArray.count else { return nil }
+            recipientID = Data(dataArray[offset..<offset+recipientIDSize])
+            offset += recipientIDSize
+        }
+        
+        // Payload handling with comprehensive bounds checking
+        let payload: Data
+        if isCompressed {
+            // Compressed payload needs at least 2 bytes for original size
+            guard Int(payloadLength) >= 2 else { return nil }
+            
+            // Check we have enough data for the original size prefix
+            guard offset + 2 <= dataArray.count else { return nil }
+            let originalSizeData = Data(dataArray[offset..<offset+2])
+            let originalSize = Int(originalSizeData.reduce(0) { result, byte in
+                (result << 8) | UInt16(byte)
+            })
+            offset += 2
+            
+            // Validate original size is reasonable
+            guard originalSize >= 0 && originalSize <= 1048576 else { return nil } // Max 1MB
+            
+            // Check we have enough data for the compressed payload
+            let compressedPayloadSize = Int(payloadLength) - 2
+            guard compressedPayloadSize >= 0 && offset + compressedPayloadSize <= dataArray.count else { 
+                return nil 
+            }
+            
+            let compressedPayload = Data(dataArray[offset..<offset+compressedPayloadSize])
+            offset += compressedPayloadSize
+            
+            // Decompress with error handling
+            guard let decompressedPayload = CompressionUtil.decompress(compressedPayload, originalSize: originalSize) else {
+                return nil
+            }
+            
+            // Verify decompressed size matches expected
+            guard decompressedPayload.count == originalSize else {
+                return nil
+            }
+            
+            payload = decompressedPayload
+        } else {
+            // Uncompressed payload
+            guard Int(payloadLength) >= 0 && offset + Int(payloadLength) <= dataArray.count else { 
+                return nil 
+            }
+            payload = Data(dataArray[offset..<offset+Int(payloadLength)])
+            offset += Int(payloadLength)
+        }
+        
+        // Signature if present
+        var signature: Data?
+        if hasSignature {
+            guard offset + signatureSize <= dataArray.count else { return nil }
+            signature = Data(dataArray[offset..<offset+signatureSize])
+            offset += signatureSize
+        }
+        
+        // Final validation: ensure we haven't gone past the end
+        guard offset <= dataArray.count else { return nil }
+        
+        return BitchatPacket(
+            type: type,
+            senderID: senderID,
+            recipientID: recipientID,
+            timestamp: timestamp,
+            payload: payload,
+            signature: signature,
+            ttl: ttl
+        )
     }
 }
 

bitchat/Protocols/Packets.swift

@@ -15,8 +15,6 @@ struct AnnouncementPacket {
 
     func encode() -> Data? {
         var data = Data()
-        // Reserve: TLVs for nickname (2 + n), noise key (2 + 32), signing key (2 + 32)
-        data.reserveCapacity(2 + min(nickname.count, 255) + 2 + noisePublicKey.count + 2 + signingPublicKey.count)
 
         // TLV for nickname
         guard let nicknameData = nickname.data(using: .utf8), nicknameData.count <= 255 else { return nil }
@@ -90,7 +88,6 @@ struct PrivateMessagePacket {
 
     func encode() -> Data? {
         var data = Data()
-        data.reserveCapacity(2 + min(messageID.count, 255) + 2 + min(content.count, 255))
 
         // TLV for messageID
         guard let messageIDData = messageID.data(using: .utf8), messageIDData.count <= 255 else { return nil }

bitchat/Services/BLEService.swift

@@ -63,9 +63,8 @@ final class BLEService: NSObject {
     private let messageDeduplicator = MessageDeduplicator()
     
     // 5. Fragment Reassembly (necessary for messages > MTU)
-    private struct FragmentKey: Hashable { let sender: UInt64; let id: UInt64 }
-    private var incomingFragments: [FragmentKey: [Int: Data]] = [:]
-    private var fragmentMetadata: [FragmentKey: (type: UInt8, total: Int, timestamp: Date)] = [:]
+    private var incomingFragments: [String: [Int: Data]] = [:]
+    private var fragmentMetadata: [String: (type: UInt8, total: Int, timestamp: Date)] = [:]
     // Backoff for peripherals that recently timed out connecting
     private var recentConnectTimeouts: [String: Date] = [:] // Peripheral UUID -> last timeout
     
@@ -89,7 +88,6 @@ final class BLEService: NSObject {
     var myPeerID: String = ""
     var myNickname: String = "anon"
     private let noiseService = NoiseEncryptionService()
-    private var myPeerIDData: Data = Data()
 
     // MARK: - Advertising Privacy
     // No Local Name by default for maximum privacy. No rotating alias.
@@ -225,30 +223,7 @@ final class BLEService: NSObject {
                 peripheral.writeValue(data, for: characteristic, type: .withoutResponse)
             } else {
                 self.collectionsQueue.async(flags: .barrier) {
-                    var queue = self.pendingPeripheralWrites[uuid] ?? []
-                    let capBytes = TransportConfig.blePendingWriteBufferCapBytes
-                    let newSize = data.count
-                    // If single chunk exceeds cap, drop it immediately
-                    if newSize > capBytes {
-                        SecureLogger.log("⚠️ Dropping oversized write chunk (\(newSize)B) for peripheral \(uuid)",
-                                         category: SecureLogger.session, level: .warning)
-                    } else {
-                        // Append and trim from the front to respect cap
-                        var total = queue.reduce(0) { $0 + $1.count }
-                        queue.append(data)
-                        total += newSize
-                        if total > capBytes {
-                            var removedBytes = 0
-                            while total > capBytes && !queue.isEmpty {
-                                let removed = queue.removeFirst()
-                                removedBytes += removed.count
-                                total -= removed.count
-                            }
-                            SecureLogger.log("📉 Trimmed pending write buffer for \(uuid) by \(removedBytes)B to \(total)B",
-                                             category: SecureLogger.session, level: .warning)
-                        }
-                        self.pendingPeripheralWrites[uuid] = queue.isEmpty ? nil : queue
-                    }
+                    self.pendingPeripheralWrites[uuid, default: []].append(data)
                 }
             }
         }
@@ -333,7 +308,6 @@ final class BLEService: NSObject {
         // Derive stable peer ID from Noise static public key fingerprint (first 8 bytes → 16 hex chars)
         let fingerprint = noiseService.getIdentityFingerprint() // 64 hex chars
         self.myPeerID = String(fingerprint.prefix(16))
-        self.myPeerIDData = Data(hexString: myPeerID) ?? Data()
         
         // Set queue key for identification
         messageQueue.setSpecific(key: messageQueueKey, value: ())
@@ -400,7 +374,7 @@ final class BLEService: NSObject {
         maintenanceTimer = timer
         
         // Publish initial empty state
-        requestPeerDataPublish()
+        publishFullPeerData()
     }
     
     func setNickname(_ nickname: String) {
@@ -489,7 +463,7 @@ final class BLEService: NSObject {
         // Send leave message synchronously to ensure delivery
         let leavePacket = BitchatPacket(
             type: MessageType.leave.rawValue,
-            senderID: myPeerIDData,
+            senderID: Data(hexString: myPeerID) ?? Data(),
             recipientID: nil,
             timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
             payload: Data(),
@@ -617,7 +591,7 @@ final class BLEService: NSObject {
                 let encrypted = try noiseService.encrypt(payload, for: peerID)
                 let packet = BitchatPacket(
                     type: MessageType.noiseEncrypted.rawValue,
-                    senderID: myPeerIDData,
+                    senderID: Data(hexString: myPeerID) ?? Data(),
                     recipientID: Data(hexString: peerID),
                     timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
                     payload: encrypted,
@@ -669,7 +643,7 @@ final class BLEService: NSObject {
             let encrypted = try noiseService.encrypt(typedPayload, for: peerID)
             let packet = BitchatPacket(
                 type: MessageType.noiseEncrypted.rawValue,
-                senderID: myPeerIDData,
+                senderID: Data(hexString: myPeerID) ?? Data(),
                 recipientID: Data(hexString: peerID),
                 timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
                 payload: encrypted,
@@ -826,7 +800,7 @@ final class BLEService: NSObject {
                 
             let packet = BitchatPacket(
                 type: MessageType.noiseEncrypted.rawValue,
-                senderID: myPeerIDData,
+                senderID: Data(hexString: myPeerID) ?? Data(),
                 recipientID: recipientData,
                 timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
                 payload: encrypted,
@@ -880,7 +854,7 @@ final class BLEService: NSObject {
             // Send handshake init
             let packet = BitchatPacket(
                 type: MessageType.noiseHandshake.rawValue,
-                senderID: myPeerIDData,
+                senderID: Data(hexString: myPeerID) ?? Data(),
                 recipientID: Data(hexString: peerID),
                 timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
                 payload: handshakeData,
@@ -930,7 +904,7 @@ final class BLEService: NSObject {
 
                 let packet = BitchatPacket(
                     type: MessageType.noiseEncrypted.rawValue,
-                    senderID: myPeerIDData,
+                    senderID: Data(hexString: myPeerID) ?? Data(),
                     recipientID: Data(hexString: peerID),
                     timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
                     payload: encrypted,
@@ -1273,11 +1247,8 @@ final class BLEService: NSObject {
         // Minimum header: 8 bytes ID + 2 index + 2 total + 1 type
         guard packet.payload.count >= 13 else { return }
 
-        // Compute compact fragment key (sender: 8 bytes, id: 8 bytes), big-endian
-        var senderU64: UInt64 = 0
-        for b in packet.senderID.prefix(8) { senderU64 = (senderU64 << 8) | UInt64(b) }
-        var fragU64: UInt64 = 0
-        for b in packet.payload.prefix(8) { fragU64 = (fragU64 << 8) | UInt64(b) }
+        let senderHex = packet.senderID.hexEncodedString()
+        let fragmentID = packet.payload[0..<8].map { String(format: "%02x", $0) }.joined()
         // Parse big-endian UInt16 safely without alignment assumptions
         let idxHi = UInt16(packet.payload[8])
         let idxLo = UInt16(packet.payload[9])
@@ -1292,7 +1263,7 @@ final class BLEService: NSObject {
         guard total > 0 && index >= 0 && index < total else { return }
 
         // Store fragment
-        let key = FragmentKey(sender: senderU64, id: fragU64)
+        let key = "\(senderHex):\(fragmentID)"
         if incomingFragments[key] == nil {
             // Cap in-flight assemblies to prevent memory/battery blowups
             if incomingFragments.count >= maxInFlightAssemblies {
@@ -1464,21 +1435,7 @@ final class BLEService: NSObject {
         }
         
         // Suppress announce logs to reduce noise
-
-        // Precompute signature verification outside barrier to reduce contention
-        let existingPeerForVerify = collectionsQueue.sync { peers[peerID] }
-        var verifiedAnnounce = false
-        if packet.signature != nil {
-            verifiedAnnounce = noiseService.verifyPacketSignature(packet, publicKey: announcement.signingPublicKey)
-            if !verifiedAnnounce {
-                SecureLogger.log("⚠️ Signature verification for announce failed \(peerID.prefix(8))", category: SecureLogger.security, level: .warning)
-            }
-        }
-        if let existingKey = existingPeerForVerify?.noisePublicKey, existingKey != announcement.noisePublicKey {
-            SecureLogger.log("⚠️ Announce key mismatch for \(peerID.prefix(8))… — keeping unverified", category: SecureLogger.security, level: .warning)
-            verifiedAnnounce = false
-        }
-
+        
         // Track if this is a new or reconnected peer
         var isNewPeer = false
         var isReconnectedPeer = false
@@ -1503,8 +1460,21 @@ final class BLEService: NSObject {
             isNewPeer = (existingPeer == nil)
             isReconnectedPeer = wasDisconnected
             
-            // Use precomputed verification result
-            let verified = verifiedAnnounce
+            // Verify packet signature using the announced signing public key
+            var verified = false
+            if packet.signature != nil {
+                // Verify that the packet was signed by the signing private key corresponding to the announced signing public key
+                verified = noiseService.verifyPacketSignature(packet, publicKey: announcement.signingPublicKey)
+                if !verified {
+                    SecureLogger.log("⚠️ Signature verification for announce failed \(peerID.prefix(8))", category: SecureLogger.security, level: .warning)
+                }
+            }
+
+            // If existing peer has a different noise public key, do not consider this verified
+            if let existing = existingPeer, let existingKey = existing.noisePublicKey, existingKey != announcement.noisePublicKey {
+                SecureLogger.log("⚠️ Announce key mismatch for \(peerID.prefix(8))… — keeping unverified", category: SecureLogger.security, level: .warning)
+                verified = false
+            }
 
             // Require verified announce; ignore otherwise (no backward compatibility)
             if !verified {
@@ -1595,7 +1565,7 @@ final class BLEService: NSObject {
                 self.delegate?.didConnectToPeer(peerID)
             }
             
-            self.requestPeerDataPublish()
+            self.publishFullPeerData()
             self.delegate?.didUpdatePeerList(currentPeerIDs)
         }
         
@@ -1696,7 +1666,7 @@ final class BLEService: NSObject {
                     // Send response
                     let responsePacket = BitchatPacket(
                         type: MessageType.noiseHandshake.rawValue,
-                        senderID: myPeerIDData,
+                        senderID: Data(hexString: myPeerID) ?? Data(),
                         recipientID: Data(hexString: peerID),
                         timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
                         payload: response,
@@ -1852,7 +1822,7 @@ final class BLEService: NSObject {
         // Create packet with signature using the noise private key
         let packet = BitchatPacket(
             type: MessageType.announce.rawValue,
-            senderID: myPeerIDData,
+            senderID: Data(hexString: myPeerID) ?? Data(),
             recipientID: nil,
             timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
             payload: payload,
@@ -1886,7 +1856,7 @@ final class BLEService: NSObject {
                 let encrypted = try noiseService.encrypt(payload, for: peerID)
                 let packet = BitchatPacket(
                     type: MessageType.noiseEncrypted.rawValue,
-                    senderID: myPeerIDData,
+                    senderID: Data(hexString: myPeerID) ?? Data(),
                     recipientID: Data(hexString: peerID),
                     timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
                     payload: encrypted,
@@ -1923,7 +1893,7 @@ final class BLEService: NSObject {
                 let encrypted = try noiseService.encrypt(payload, for: peerID)
                 let packet = BitchatPacket(
                     type: MessageType.noiseEncrypted.rawValue,
-                    senderID: myPeerIDData,
+                    senderID: Data(hexString: myPeerID) ?? Data(),
                     recipientID: Data(hexString: peerID),
                     timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
                     payload: encrypted,
@@ -1989,28 +1959,6 @@ final class BLEService: NSObject {
             self?.peerEventsDelegate?.didUpdatePeerSnapshots(transportPeers)
         }
     }
-
-    // Debounced publish to coalesce rapid changes
-    private var lastPeerPublishAt: Date = .distantPast
-    private var peerPublishPending: Bool = false
-    private let peerPublishMinInterval: TimeInterval = 0.1
-    private func requestPeerDataPublish() {
-        let now = Date()
-        let elapsed = now.timeIntervalSince(lastPeerPublishAt)
-        if elapsed >= peerPublishMinInterval {
-            lastPeerPublishAt = now
-            publishFullPeerData()
-        } else if !peerPublishPending {
-            peerPublishPending = true
-            let delay = peerPublishMinInterval - elapsed
-            messageQueue.asyncAfter(deadline: .now() + delay) { [weak self] in
-                guard let self = self else { return }
-                self.lastPeerPublishAt = Date()
-                self.peerPublishPending = false
-                self.publishFullPeerData()
-            }
-        }
-    }
     
     // MARK: - Consolidated Maintenance
     
@@ -2124,7 +2072,7 @@ final class BLEService: NSObject {
                     self.delegate?.didDisconnectFromPeer(peerID)
                 }
                 // Publish snapshots so UnifiedPeerService updates connection/reachability icons
-                self.requestPeerDataPublish()
+                self.publishFullPeerData()
                 self.delegate?.didUpdatePeerList(currentPeerIDs)
             }
         }
@@ -2506,7 +2454,7 @@ func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeriph
             if let peerID = peerID {
                 self.notifyPeerDisconnectedDebounced(peerID)
             }
-            self.requestPeerDataPublish()
+            self.publishFullPeerData()
             self.delegate?.didUpdatePeerList(currentPeerIDs)
         }
     }
@@ -2907,7 +2855,7 @@ extension BLEService: CBPeripheralManagerDelegate {
                 
                 self.notifyPeerDisconnectedDebounced(peerID)
                 // Publish snapshots so UnifiedPeerService can refresh icons promptly
-                self.requestPeerDataPublish()
+                self.publishFullPeerData()
                 self.delegate?.didUpdatePeerList(currentPeerIDs)
             }
         }

bitchat/Services/MessageRouter.swift

@@ -89,19 +89,10 @@ final class MessageRouter {
 
     // MARK: - Outbox Management
     private func canSendViaNostr(peerID: String) -> Bool {
-        // Two forms are supported:
-        // - 64-hex Noise public key (32 bytes)
-        // - 16-hex short peer ID (derived from Noise pubkey)
-        if peerID.count == 64, let noiseKey = Data(hexString: peerID) {
-            if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey),
-               fav.peerNostrPublicKey != nil {
-                return true
-            }
-        } else if peerID.count == 16 {
-            if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: peerID),
-               fav.peerNostrPublicKey != nil {
-                return true
-            }
+        guard let noiseKey = Data(hexString: peerID) else { return false }
+        if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey),
+           fav.peerNostrPublicKey != nil {
+            return true
         }
         return false
     }
@@ -110,7 +101,6 @@ final class MessageRouter {
         guard let queued = outbox[peerID], !queued.isEmpty else { return }
         SecureLogger.log("Flushing outbox for \(peerID.prefix(8))… count=\(queued.count)",
                         category: SecureLogger.session, level: .debug)
-        var remaining: [(content: String, nickname: String, messageID: String)] = []
         // Prefer mesh if connected; else try Nostr if mapping exists
         for (content, nickname, messageID) in queued {
             if mesh.isPeerReachable(peerID) {
@@ -122,19 +112,14 @@ final class MessageRouter {
                                 category: SecureLogger.session, level: .debug)
                 nostr.sendPrivateMessage(content, to: peerID, recipientNickname: nickname, messageID: messageID)
             } else {
-                // Keep unsent items queued
-                remaining.append((content, nickname, messageID))
+                continue
             }
         }
-        // Persist only items we could not send
-        if remaining.isEmpty {
-            outbox.removeValue(forKey: peerID)
-        } else {
-            outbox[peerID] = remaining
-        }
+        // Remove all flushed items (remaining ones, if any, will be re-queued on next call)
+        outbox[peerID]?.removeAll()
     }
 
     func flushAllOutbox() {
-        for key in Array(outbox.keys) { flushOutbox(for: key) }
+        for key in outbox.keys { flushOutbox(for: key) }
     }
 }

bitchat/Services/UnifiedPeerService.swift

@@ -27,7 +27,6 @@ class UnifiedPeerService: ObservableObject, TransportPeerEventsDelegate {
     private var peerIndex: [String: BitchatPeer] = [:]
     private var fingerprintCache: [String: String] = [:]  // peerID -> fingerprint
     private let meshService: Transport
-    weak var messageRouter: MessageRouter?
     private let favoritesService = FavoritesPersistenceService.shared
     private var cancellables = Set<AnyCancellable>()
     
@@ -331,13 +330,8 @@ class UnifiedPeerService: ObservableObject, TransportPeerEventsDelegate {
         SecureLogger.log("⭐️ Toggled favorite for '\(finalNickname)' (peerID: \(peerID), was: \(wasFavorite), now: \(!wasFavorite))",
                        category: SecureLogger.session, level: .debug)
         
-        // Send favorite notification to the peer via router (mesh or Nostr)
-        if let router = messageRouter {
-            router.sendFavoriteNotification(to: peerID, isFavorite: !wasFavorite)
-        } else {
-            // Fallback to mesh-only if router not yet wired
-            meshService.sendFavoriteNotification(to: peerID, isFavorite: !wasFavorite)
-        }
+        // Send favorite notification to the peer
+        meshService.sendFavoriteNotification(to: peerID, isFavorite: !wasFavorite)
         
         // Force update of peers to reflect the change
         updatePeers()

bitchat/Utils/MessageDeduplicator.swift

@@ -9,7 +9,6 @@ final class MessageDeduplicator {
     }
 
     private var entries: [Entry] = []
-    private var head: Int = 0
     private var lookup = Set<String>()
     private let lock = NSLock()
     private let maxAge: TimeInterval = TransportConfig.messageDedupMaxAgeSeconds  // 5 minutes
@@ -29,18 +28,10 @@ final class MessageDeduplicator {
         entries.append(Entry(messageID: messageID, timestamp: Date()))
         lookup.insert(messageID)
 
-        // Soft-cap and advance head by a chunk to avoid O(n) shifting
-        if (entries.count - head) > maxCount {
-            let removeCount = min(100, entries.count - head)
-            for i in head..<(head + removeCount) {
-                lookup.remove(entries[i].messageID)
-            }
-            head += removeCount
-            // Periodically compact to reclaim memory
-            if head > entries.count / 2 {
-                entries.removeFirst(head)
-                head = 0
-            }
+        if entries.count > maxCount {
+            let toRemove = entries.prefix(100)
+            toRemove.forEach { lookup.remove($0.messageID) }
+            entries.removeFirst(100)
         }
 
         return false
@@ -70,7 +61,6 @@ final class MessageDeduplicator {
         defer { lock.unlock() }
 
         entries.removeAll()
-        head = 0
         lookup.removeAll()
     }
 
@@ -88,13 +78,9 @@ final class MessageDeduplicator {
 
     private func cleanupOldEntries() {
         let cutoff = Date().addingTimeInterval(-maxAge)
-        while head < entries.count, entries[head].timestamp < cutoff {
-            lookup.remove(entries[head].messageID)
-            head += 1
-        }
-        if head > 0 && head > entries.count / 2 {
-            entries.removeFirst(head)
-            head = 0
+        while let first = entries.first, first.timestamp < cutoff {
+            lookup.remove(first.messageID)
+            entries.removeFirst()
         }
     }
 }

bitchat/Utils/SecureLogger.swift

@@ -140,11 +140,11 @@ class SecureLogger {
     }
     
     /// Log general messages with automatic sensitive data filtering
-    static func log(_ message: @autoclosure () -> String, category: OSLog = noise, level: LogLevel = .debug,
+    static func log(_ message: String, category: OSLog = noise, level: LogLevel = .debug,
                     file: String = #file, line: Int = #line, function: String = #function) {
         guard shouldLog(level) else { return }
         let location = formatLocation(file: file, line: line, function: function)
-        let sanitized = sanitize("\(location) \(message())")
+        let sanitized = sanitize("\(location) \(message)")
         
         #if DEBUG
         os_log("%{public}@", log: category, type: level.osLogType, sanitized)
@@ -157,10 +157,10 @@ class SecureLogger {
     }
     
     /// Log errors with context
-    static func logError(_ error: Error, context: @autoclosure () -> String, category: OSLog = noise,
+    static func logError(_ error: Error, context: String, category: OSLog = noise,
                         file: String = #file, line: Int = #line, function: String = #function) {
         let location = formatLocation(file: file, line: line, function: function)
-        let sanitized = sanitize(context())
+        let sanitized = sanitize(context)
         let errorDesc = sanitize(error.localizedDescription)
         
         #if DEBUG

bitchat/ViewModels/ChatViewModel.swift

@@ -382,11 +382,6 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
     @Published var showBluetoothAlert = false
     @Published var bluetoothAlertMessage = ""
     @Published var bluetoothState: CBManagerState = .unknown
-
-    // Presentation state for privacy gating
-    @Published var isLocationChannelsSheetPresented: Bool = false
-    @Published var isAppInfoPresented: Bool = false
-    @Published var showScreenshotPrivacyWarning: Bool = false
     
     // Messages are naturally ephemeral - no persistent storage
     // Persist mesh public timeline across channel switches
@@ -492,8 +487,6 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
         self.messageRouter = MessageRouter(mesh: meshService, nostr: nostrTransport)
         // Route receipts from PrivateChatManager through MessageRouter
         self.privateChatManager.messageRouter = self.messageRouter
-        // Allow UnifiedPeerService to route favorite notifications via mesh/Nostr
-        self.unifiedPeerService.messageRouter = self.messageRouter
         self.autocompleteService = AutocompleteService()
         
         // Wire up dependencies
@@ -1414,11 +1407,6 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
         switch channel {
         case .mesh:
             messages = meshTimeline
-            // Debug: log if any empty messages are present
-            let emptyMesh = messages.filter { $0.content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }.count
-            if emptyMesh > 0 {
-                SecureLogger.log("RenderGuard: mesh timeline contains \(emptyMesh) empty messages", category: SecureLogger.session, level: .debug)
-            }
             stopGeoParticipantsTimer()
             geohashPeople = []
             teleportedGeo.removeAll()
@@ -1426,26 +1414,13 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
             // Sanitize existing timeline (filter any prior empty-content entries)
             var arr = geoTimelines[ch.geohash] ?? []
             arr.removeAll { $0.content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }
-            // Deduplicate by ID while preserving order (from oldest to newest)
+            // Ensure chronological order when returning to a geohash
             if arr.count > 1 {
-                var seen = Set<String>()
-                var dedup: [BitchatMessage] = []
-                for m in arr.sorted(by: { $0.timestamp < $1.timestamp }) {
-                    if !seen.contains(m.id) {
-                        dedup.append(m)
-                        seen.insert(m.id)
-                    }
-                }
-                arr = dedup
+                arr.sort { $0.timestamp < $1.timestamp }
             }
             // Persist the cleaned/sorted timeline for this geohash
             geoTimelines[ch.geohash] = arr
             messages = arr
-            // Debug: log if any empty messages are present post-sanitize
-            let emptyGeo = messages.filter { $0.content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }.count
-            if emptyGeo > 0 {
-                SecureLogger.log("RenderGuard: geohash \(ch.geohash) timeline has \(emptyGeo) empty messages after sanitize", category: SecureLogger.session, level: .debug)
-            }
         }
         // Unsubscribe previous
         if let sub = geoSubscriptionID {
@@ -2613,17 +2588,6 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
     
     @MainActor
     @objc private func userDidTakeScreenshot() {
-        // Respect privacy: do not broadcast screenshots taken from non-chat sheets
-        if isLocationChannelsSheetPresented {
-            // Show a warning about sharing location screenshots publicly
-            showScreenshotPrivacyWarning = true
-            return
-        }
-        if isAppInfoPresented {
-            // Silently ignore screenshots of app info
-            return
-        }
-
         // Send screenshot notification based on current context
         let screenshotMessage = "* \(nickname) took a screenshot *"
         
@@ -2643,7 +2607,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                 }
             }
             
-            // Show local notification immediately as system message (only in chat)
+            // Show local notification immediately as system message
             let localNotification = BitchatMessage(
                 sender: "system",
                 content: "you took a screenshot",
@@ -2694,7 +2658,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
             }
             
 
-            // Show local notification immediately as system message (only in chat)
+            // Show local notification immediately as system message
             let localNotification = BitchatMessage(
                 sender: "system",
                 content: "you took a screenshot",
@@ -3079,10 +3043,8 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
         let mentionRegex = try? NSRegularExpression(pattern: mentionPattern, options: [])
         let hashtagRegex = try? NSRegularExpression(pattern: hashtagPattern, options: [])
         
-        let nsContent = contentText as NSString
-        let nsLen = nsContent.length
-        let mentionMatches = mentionRegex?.matches(in: contentText, options: [], range: NSRange(location: 0, length: nsLen)) ?? []
-        let hashtagMatches = hashtagRegex?.matches(in: contentText, options: [], range: NSRange(location: 0, length: nsLen)) ?? []
+        let mentionMatches = mentionRegex?.matches(in: contentText, options: [], range: NSRange(location: 0, length: contentText.count)) ?? []
+        let hashtagMatches = hashtagRegex?.matches(in: contentText, options: [], range: NSRange(location: 0, length: contentText.count)) ?? []
         
         // Combine and sort all matches
         var allMatches: [(range: NSRange, type: String)] = []
@@ -3099,14 +3061,12 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
         for (matchRange, matchType) in allMatches {
             // Add text before the match
             if let range = Range(matchRange, in: contentText) {
-                if lastEndIndex < range.lowerBound {
-                    let beforeText = String(contentText[lastEndIndex..<range.lowerBound])
-                    if !beforeText.isEmpty {
-                        var normalStyle = AttributeContainer()
-                        normalStyle.font = .system(size: 14, design: .monospaced)
-                        normalStyle.foregroundColor = isDark ? Color.white : Color.black
-                        processedContent.append(AttributedString(beforeText).mergingAttributes(normalStyle))
-                    }
+                let beforeText = String(contentText[lastEndIndex..<range.lowerBound])
+                if !beforeText.isEmpty {
+                    var normalStyle = AttributeContainer()
+                    normalStyle.font = .system(size: 14, design: .monospaced)
+                    normalStyle.foregroundColor = isDark ? Color.white : Color.black
+                    processedContent.append(AttributedString(beforeText).mergingAttributes(normalStyle))
                 }
                 
                 // Add the match with appropriate styling
@@ -3124,7 +3084,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                 
                 processedContent.append(AttributedString(matchText).mergingAttributes(matchStyle))
                 
-                if lastEndIndex < range.upperBound { lastEndIndex = range.upperBound }
+                lastEndIndex = range.upperBound
             }
         }
         
@@ -3201,12 +3161,9 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
             
             // For extremely long content, render as plain text to avoid heavy regex/layout work,
             // unless the content includes Cashu tokens we want to chip-render below
-            // Compute NSString-backed length for regex/nsrange correctness with multi-byte characters
-            let nsContent = content as NSString
-            let nsLen = nsContent.length
             let containsCashuEarly: Bool = {
                 let rx = Regexes.quickCashuPresence
-                return rx.numberOfMatches(in: content, options: [], range: NSRange(location: 0, length: nsLen)) > 0
+                return rx.numberOfMatches(in: content, options: [], range: NSRange(location: 0, length: content.count)) > 0
             }()
             if (content.count > 4000 || content.hasVeryLongToken(threshold: 1024)) && !containsCashuEarly {
                 var plainStyle = AttributeContainer()
@@ -3224,6 +3181,8 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
             let lnurlRegex = Regexes.lnurl
             let lightningSchemeRegex = Regexes.lightningScheme
             let detector = Regexes.linkDetector
+            
+            let nsLen = content.count
             let hasMentionsHint = content.contains("@")
             let hasHashtagsHint = content.contains("#")
             let hasURLHint = content.contains("://") || content.contains("www.") || content.contains("http")
@@ -3303,19 +3262,17 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
             for (range, type) in allMatches {
                 // Add text before match
                 if let nsRange = Range(range, in: content) {
-                    if lastEnd < nsRange.lowerBound {
-                        let beforeText = String(content[lastEnd..<nsRange.lowerBound])
-                        if !beforeText.isEmpty {
-                            var beforeStyle = AttributeContainer()
-                            beforeStyle.foregroundColor = baseColor
-                            beforeStyle.font = isSelf
-                                ? .system(size: 14, weight: .bold, design: .monospaced)
-                                : .system(size: 14, design: .monospaced)
-                            if isMentioned {
-                                beforeStyle.font = beforeStyle.font?.bold()
-                            }
-                            result.append(AttributedString(beforeText).mergingAttributes(beforeStyle))
+                    let beforeText = String(content[lastEnd..<nsRange.lowerBound])
+                    if !beforeText.isEmpty {
+                        var beforeStyle = AttributeContainer()
+                        beforeStyle.foregroundColor = baseColor
+                        beforeStyle.font = isSelf
+                            ? .system(size: 14, weight: .bold, design: .monospaced)
+                            : .system(size: 14, design: .monospaced)
+                        if isMentioned {
+                            beforeStyle.font = beforeStyle.font?.bold()
                         }
+                        result.append(AttributedString(beforeText).mergingAttributes(beforeStyle))
                     }
                     
                     // Add styled match
@@ -3423,10 +3380,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                             result.append(AttributedString(matchText).mergingAttributes(matchStyle))
                         }
                     }
-                    // Advance lastEnd safely in case of overlaps
-                    if lastEnd < nsRange.upperBound {
-                        lastEnd = nsRange.upperBound
-                    }
+                    lastEnd = nsRange.upperBound
                 }
             }
             
@@ -3524,23 +3478,19 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
             // Regular expression to find @mentions
             let pattern = "@([\\p{L}0-9_]+)"
             let regex = try? NSRegularExpression(pattern: pattern, options: [])
-            let nsContent = contentText as NSString
-            let nsLen = nsContent.length
-            let matches = regex?.matches(in: contentText, options: [], range: NSRange(location: 0, length: nsLen)) ?? []
+            let matches = regex?.matches(in: contentText, options: [], range: NSRange(location: 0, length: contentText.count)) ?? []
             
             var lastEndIndex = contentText.startIndex
             
             for match in matches {
                 // Add text before the mention
                 if let range = Range(match.range(at: 0), in: contentText) {
-                    if lastEndIndex < range.lowerBound {
-                        let beforeText = String(contentText[lastEndIndex..<range.lowerBound])
-                        if !beforeText.isEmpty {
-                            var normalStyle = AttributeContainer()
-                            normalStyle.font = .system(size: 14, design: .monospaced)
-                            normalStyle.foregroundColor = isDark ? Color.white : Color.black
-                            processedContent.append(AttributedString(beforeText).mergingAttributes(normalStyle))
-                        }
+                    let beforeText = String(contentText[lastEndIndex..<range.lowerBound])
+                    if !beforeText.isEmpty {
+                        var normalStyle = AttributeContainer()
+                        normalStyle.font = .system(size: 14, design: .monospaced)
+                        normalStyle.foregroundColor = isDark ? Color.white : Color.black
+                        processedContent.append(AttributedString(beforeText).mergingAttributes(normalStyle))
                     }
                     
                     // Add the mention with highlight
@@ -3550,7 +3500,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                     mentionStyle.foregroundColor = Color.orange
                     processedContent.append(AttributedString(mentionText).mergingAttributes(mentionStyle))
                     
-                    if lastEndIndex < range.upperBound { lastEndIndex = range.upperBound }
+                    lastEndIndex = range.upperBound
                 }
             }
             
@@ -4748,9 +4698,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
         // Allow optional disambiguation suffix '#abcd' for duplicate nicknames
         let pattern = "@([\\p{L}0-9_]+(?:#[a-fA-F0-9]{4})?)"
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
-        let nsContent = content as NSString
-        let nsLen = nsContent.length
-        let matches = regex?.matches(in: content, options: [], range: NSRange(location: 0, length: nsLen)) ?? []
+        let matches = regex?.matches(in: content, options: [], range: NSRange(location: 0, length: content.count)) ?? []
         
         var mentions: [String] = []
         let peerNicknames = meshService.getPeerNicknames()
@@ -5817,12 +5765,9 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
         if isGeo && finalMessage.sender != "system" {
             if let gh = currentGeohash {
                 var arr = geoTimelines[gh] ?? []
-                // Dedup by message ID before appending to per-geohash timeline
-                if !arr.contains(where: { $0.id == finalMessage.id }) {
-                    arr.append(finalMessage)
-                    if arr.count > geoTimelineCap { arr = Array(arr.suffix(geoTimelineCap)) }
-                    geoTimelines[gh] = arr
-                }
+                arr.append(finalMessage)
+                if arr.count > geoTimelineCap { arr = Array(arr.suffix(geoTimelineCap)) }
+                geoTimelines[gh] = arr
             }
         }
 

bitchat/Views/ContentView.swift

@@ -165,8 +165,6 @@ struct ContentView: View {
         }
         .sheet(isPresented: $showAppInfo) {
             AppInfoView()
-                .onAppear { viewModel.isAppInfoPresented = true }
-                .onDisappear { viewModel.isAppInfoPresented = false }
         }
         .sheet(isPresented: Binding(
             get: { viewModel.showingFingerprintFor != nil },
@@ -281,10 +279,8 @@ struct ContentView: View {
                         }
                     }()
                     let items = windowedMessages.map { (uiID: "\(contextKey)|\($0.id)", message: $0) }
-                    // Filter out empty/whitespace-only messages to avoid blank rows
-                    let filteredItems = items.filter { !$0.message.content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }
-
-                    ForEach(filteredItems, id: \.uiID) { item in
+                    
+                    ForEach(items, id: \.uiID) { item in
                         let message = item.message
                         VStack(alignment: .leading, spacing: 0) {
                             // Check if current user is mentioned
@@ -1186,13 +1182,6 @@ struct ContentView: View {
         .padding(.horizontal, 12)
         .sheet(isPresented: $showLocationChannelsSheet) {
             LocationChannelsSheet(isPresented: $showLocationChannelsSheet)
-                .onAppear { viewModel.isLocationChannelsSheetPresented = true }
-                .onDisappear { viewModel.isLocationChannelsSheetPresented = false }
-        }
-        .alert("heads up", isPresented: $viewModel.showScreenshotPrivacyWarning) {
-            Button("ok", role: .cancel) {}
-        } message: {
-            Text("screenshots of location channels will reveal your location. think before sharing publicly.")
         }
         .background(backgroundColor.opacity(0.95))
     }

bitchat/Views/LocationChannelsSheet.swift

@@ -304,17 +304,22 @@ struct LocationChannelsSheet: View {
                                 .foregroundColor(.secondary)
                         }
                     }
-                let subtitleFull: String = {
-                    if let name = subtitleName, !name.isEmpty {
-                        return subtitlePrefix + " • " + name
+                    HStack(spacing: 0) {
+                        Text(subtitlePrefix)
+                            .font(.system(size: 12, design: .monospaced))
+                            .foregroundColor(.secondary)
+                        if let name = subtitleName {
+                            Text(" • ")
+                                .font(.system(size: 12, design: .monospaced))
+                                .foregroundColor(.secondary)
+                            Text(name)
+                                .font(.system(size: 12, design: .monospaced))
+                                .fontWeight(subtitleNameBold ? .bold : .regular)
+                                .foregroundColor(.secondary)
+                                .lineLimit(1)
+                                .truncationMode(.tail)
+                        }
                     }
-                    return subtitlePrefix
-                }()
-                Text(subtitleFull)
-                    .font(.system(size: 12, design: .monospaced))
-                    .foregroundColor(.secondary)
-                    .lineLimit(1)
-                    .truncationMode(.tail)
                 }
                 Spacer()
                 if isSelected {