From 7e8c5d0153b4a86617700d36122b15d7bd5fe664 Mon Sep 17 00:00:00 2001 From: jack Date: Thu, 3 Jul 2025 23:33:44 +0200 Subject: [PATCH] Fix voice note fragment handling and narrow macOS sidebar - Fix fragment processing bug where fragments were logged but not handled - Remove redundant 'Processing fragment directly' check that prevented handling - Make macOS sidebar narrower (300px max or 40% of width, whichever is smaller) - iOS sidebar remains at 70% width for better touch interaction --- bitchat/Services/BluetoothMeshService.swift | 8 +------- bitchat/Views/ContentView.swift | 4 ++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bitchat/Services/BluetoothMeshService.swift b/bitchat/Services/BluetoothMeshService.swift index 3e78d9d7..3457d921 100644 --- a/bitchat/Services/BluetoothMeshService.swift +++ b/bitchat/Services/BluetoothMeshService.swift @@ -997,13 +997,7 @@ extension BluetoothMeshService: CBPeripheralDelegate { let packetSenderID = String(data: packet.senderID.trimmingNullBytes(), encoding: .utf8) ?? "unknown" print("[PERIPHERAL] Received data from localPeerID: \(localPeerID), packetSenderID: \(packetSenderID), packet type: \(packet.type)") - // Handle fragments directly if it's a fragment type - if packet.type == MessageType.fragmentStart.rawValue || - packet.type == MessageType.fragmentContinue.rawValue || - packet.type == MessageType.fragmentEnd.rawValue { - print("[PERIPHERAL] Processing fragment directly") - } - + // Always handle received packets handleReceivedPacket(packet, from: packetSenderID, peripheral: peripheral) } diff --git a/bitchat/Views/ContentView.swift b/bitchat/Views/ContentView.swift index 9ab04d3f..8a367621 100644 --- a/bitchat/Views/ContentView.swift +++ b/bitchat/Views/ContentView.swift @@ -85,7 +85,11 @@ struct ContentView: View { } sidebarView + #if os(macOS) + .frame(width: min(300, geometry.size.width * 0.4)) + #else .frame(width: geometry.size.width * 0.7) + #endif .transition(.move(edge: .trailing)) } .offset(x: showSidebar ? -sidebarDragOffset : geometry.size.width - sidebarDragOffset)