permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-24 23:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove debug logging from delivery confirmation feature

Browse Source 
- Remove all [Delivery], [UI], and [DeliveryTracker] debug print statements
- Clean up console output for production use
- No functional changes
This commit is contained in:
jack
2025-07-06 23:52:42 +02:00
parent 784a809d07
commit 42cb696cc8
4 changed files with 1 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Services/BluetoothMeshService.swift
-6
View File
@@ -678,7 +678,6 @@ class BluetoothMeshService: NSObject {
// Encode the ACK
guard let ackData = ack.encode() else {
print("[DeliveryTracker] Failed to encode ACK")
return
}
@@ -687,7 +686,6 @@ class BluetoothMeshService: NSObject {
do {
encryptedPayload = try self.encryptionService.encrypt(ackData, for: recipientID)
} catch {
print("[DeliveryTracker] Failed to encrypt ACK: \(error)")
return
}
@@ -708,13 +706,11 @@ class BluetoothMeshService: NSObject {
}
func sendReadReceipt(_ receipt: ReadReceipt, to recipientID: String) {
print("[DeliveryTracker] Sending read receipt for message \(receipt.originalMessageID) to \(recipientID)")
messageQueue.async { [weak self] in
guard let self = self else { return }
// Encode the receipt
guard let receiptData = receipt.encode() else {
print("[DeliveryTracker] Failed to encode read receipt")
return
}
@@ -723,7 +719,6 @@ class BluetoothMeshService: NSObject {
do {
encryptedPayload = try self.encryptionService.encrypt(receiptData, for: recipientID)
} catch {
print("[DeliveryTracker] Failed to encrypt read receipt: \(error)")
return
}
@@ -738,7 +733,6 @@ class BluetoothMeshService: NSObject {
ttl: 3 // Limited TTL for receipts
)
print("[DeliveryTracker] Broadcasting read receipt packet to \(recipientID)")
// Send immediately without delay
self.broadcastPacket(packet)
}
bitchat/Services/DeliveryTracker.swift
-5
View File
@@ -71,7 +71,6 @@ class DeliveryTracker {
// Don't track broadcasts or certain message types
guard message.isPrivate || message.room != nil else { return }
print("[DeliveryTracker] Tracking message \(message.id) to \(recipientNickname)")
let delivery = PendingDelivery(
messageID: message.id,
@@ -103,11 +102,9 @@ class DeliveryTracker {
pendingLock.lock()
defer { pendingLock.unlock() }
print("[DeliveryTracker] Processing ACK for message \(ack.originalMessageID) from \(ack.recipientNickname)")
// Prevent duplicate ACK processing
guard !receivedAckIDs.contains(ack.ackID) else {
print("[DeliveryTracker] Already processed ACK \(ack.ackID)")
return
}
receivedAckIDs.insert(ack.ackID)
@@ -115,7 +112,6 @@ class DeliveryTracker {
// Find the pending delivery
guard var delivery = pendingDeliveries[ack.originalMessageID] else {
// Message might have already been delivered or timed out
print("[DeliveryTracker] No pending delivery found for message \(ack.originalMessageID)")
return
}
@@ -156,7 +152,6 @@ class DeliveryTracker {
guard !sentAckIDs.contains(message.id) else { return nil }
sentAckIDs.insert(message.id)
print("[DeliveryTracker] Generating ACK for message \(message.id) from \(message.sender)")
return DeliveryAck(
originalMessageID: message.id,
bitchat/ViewModels/ChatViewModel.swift
-53
View File
@@ -867,7 +867,6 @@ class ChatViewModel: ObservableObject {
// IMPORTANT: When sending a message, it means we're viewing this chat
// Send read receipts for any delivered messages from this peer
print("[Delivery] Sending private message to \(peerID), checking for unread messages first")
markPrivateMessagesAsRead(from: peerID)
// Create the message locally
@@ -901,16 +900,13 @@ class ChatViewModel: ObservableObject {
}
func startPrivateChat(with peerID: String) {
print("[Delivery] Starting private chat with peer \(peerID)")
let peerNickname = meshService.getPeerNicknames()[peerID] ?? "unknown"
print("[Delivery] My nickname: \(nickname), peer nickname: \(peerNickname)")
selectedPrivateChatPeer = peerID
unreadPrivateMessages.remove(peerID)
// Check if we need to migrate messages from an old peer ID
// This happens when peer IDs change between sessions
if privateChats[peerID] == nil || privateChats[peerID]?.isEmpty == true {
print("[Delivery] No messages under current peer ID \(peerID), checking for messages from nickname \(peerNickname)")
// Look for messages from this nickname under other peer IDs
var migratedMessages: [BitchatMessage] = []
@@ -932,7 +928,6 @@ class ChatViewModel: ObservableObject {
}
if !messagesWithPeer.isEmpty {
print("[Delivery] Found \(messagesWithPeer.count) messages with \(peerNickname) under old peer ID \(oldPeerID)")
// Check if ALL messages in this chat are between us and this peer
let allMessagesAreWithPeer = messages.allSatisfy { msg in
@@ -942,7 +937,6 @@ class ChatViewModel: ObservableObject {
if allMessagesAreWithPeer {
// This entire chat history belongs to this peer, migrate it all
print("[Delivery] Migrating entire chat history (\(messages.count) messages) from old peer ID \(oldPeerID) to new peer ID \(peerID)")
migratedMessages.append(contentsOf: messages)
oldPeerIDsToRemove.append(oldPeerID)
}
@@ -959,23 +953,16 @@ class ChatViewModel: ObservableObject {
// Initialize chat history with migrated messages if any
if !migratedMessages.isEmpty {
privateChats[peerID] = migratedMessages.sorted { $0.timestamp < $1.timestamp }
print("[Delivery] Migrated \(migratedMessages.count) messages to peer \(peerID)")
} else {
privateChats[peerID] = []
print("[Delivery] Initialized empty chat history for peer \(peerID)")
}
}
let messages = privateChats[peerID] ?? []
print("[Delivery] Chat with peer \(peerID) now has \(messages.count) messages")
for (index, msg) in messages.enumerated() {
print("[Delivery] Message \(index): from \(msg.sender), status: \(msg.deliveryStatus?.displayText ?? "none")")
}
// Send read receipts for unread messages from this peer
// Add a small delay to ensure UI has updated
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { [weak self] in
print("[Delivery] Delayed call to markPrivateMessagesAsRead for peer \(peerID)")
self?.markPrivateMessagesAsRead(from: peerID)
}
@@ -990,12 +977,10 @@ class ChatViewModel: ObservableObject {
@objc private func appDidBecomeActive() {
// When app becomes active, send read receipts for visible private chat
if let peerID = selectedPrivateChatPeer {
print("[Delivery] App became active with selectedPrivateChatPeer = \(peerID)")
// Try immediately
self.markPrivateMessagesAsRead(from: peerID)
// And again with a delay
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
print("[Delivery] App became active (delayed), checking for messages to mark as read in chat with \(peerID)")
self.markPrivateMessagesAsRead(from: peerID)
}
}
@@ -1004,15 +989,10 @@ class ChatViewModel: ObservableObject {
func markPrivateMessagesAsRead(from peerID: String) {
// Get the nickname for this peer
let peerNickname = meshService.getPeerNicknames()[peerID] ?? ""
print("[Delivery] ========== markPrivateMessagesAsRead START ==========")
print("[Delivery] Called for peer \(peerID) (\(peerNickname))")
print("[Delivery] My nickname: \(nickname), My peerID: \(meshService.myPeerID)")
// First ensure we have the latest messages (in case of migration)
if let messages = privateChats[peerID], !messages.isEmpty {
print("[Delivery] Found \(messages.count) messages in privateChats[\(peerID)]")
} else {
print("[Delivery] No messages found in privateChats[\(peerID)], checking all chats for messages from \(peerNickname)")
// Look through ALL private chats to find messages from this nickname
for (chatPeerID, chatMessages) in privateChats {
@@ -1020,18 +1000,14 @@ class ChatViewModel: ObservableObject {
msg.sender == peerNickname && msg.sender != nickname
}
if !relevantMessages.isEmpty {
print("[Delivery] Found \(relevantMessages.count) messages from \(peerNickname) in privateChats[\(chatPeerID)]")
}
}
}
guard let messages = privateChats[peerID], !messages.isEmpty else {
print("[Delivery] No messages to process for peer \(peerID)")
print("[Delivery] ========== markPrivateMessagesAsRead END (no messages) ==========")
return
}
print("[Delivery] Processing \(messages.count) messages in chat with peer \(peerID) (\(peerNickname)) for read receipts")
// Find messages from the peer that haven't been read yet
var readReceiptsSent = 0
@@ -1046,11 +1022,6 @@ class ChatViewModel: ObservableObject {
// This is a message FROM the peer if it's not from us AND (matches nickname OR peer ID OR is private to us)
let isFromPeer = !isOurMessage && (isFromPeerByNickname || isFromPeerByID || isPrivateToUs)
print("[Delivery] Message \(index): id=\(message.id)")
print("[Delivery] from=\(message.sender), recipientNickname=\(message.recipientNickname ?? "nil")")
print("[Delivery] senderPeerID=\(message.senderPeerID ?? "nil"), currentPeerID=\(peerID)")
print("[Delivery] isPrivate=\(message.isPrivate), isOurMessage=\(isOurMessage), isFromPeer=\(isFromPeer)")
print("[Delivery] status=\(message.deliveryStatus?.displayText ?? "none")")
if isFromPeer {
if let status = message.deliveryStatus {
@@ -1064,45 +1035,31 @@ class ChatViewModel: ObservableObject {
readerNickname: nickname
)
meshService.sendReadReceipt(receipt, to: peerID)
print("[Delivery] ✓ Sending read receipt for message \(message.id) from \(message.sender) to current peer \(peerID)")
readReceiptsSent += 1
case .read:
// Already read, no need to send another receipt
print("[Delivery] Message \(message.id) already marked as read")
default:
// Message not yet delivered, can't mark as read
print("[Delivery] Message \(message.id) has status \(status.displayText), not sending read receipt")
}
} else {
// No delivery status - this might be an older message
// Send read receipt anyway for backwards compatibility
print("[Delivery] Message \(message.id) has no delivery status, sending read receipt anyway")
let receipt = ReadReceipt(
originalMessageID: message.id,
readerID: meshService.myPeerID,
readerNickname: nickname
)
meshService.sendReadReceipt(receipt, to: peerID)
print("[Delivery] ✓ Sending read receipt for old message \(message.id) to current peer \(peerID)")
readReceiptsSent += 1
}
} else {
print("[Delivery] Skipping message \(message.id) - it's from us (\(nickname))")
}
}
print("[Delivery] Sent \(readReceiptsSent) read receipts to peer \(peerID)")
print("[Delivery] ========== markPrivateMessagesAsRead END ==========")
}
func getPrivateChatMessages(for peerID: String) -> [BitchatMessage] {
let messages = privateChats[peerID] ?? []
if !messages.isEmpty {
print("[UI] Getting \(messages.count) messages for peer \(peerID)")
if let lastMessage = messages.last {
print("[UI] Last message status: \(lastMessage.deliveryStatus?.displayText ?? "none")")
}
}
return messages
}
@@ -1964,7 +1921,6 @@ extension ChatViewModel: BitchatDelegate {
}
if isRelevantChat {
print("[Delivery] Found existing chat with \(senderNickname) under old peer ID \(oldPeerID), migrating to \(peerID)")
migratedMessages.append(contentsOf: messages)
oldPeerIDsToRemove.append(oldPeerID)
}
@@ -1992,7 +1948,6 @@ extension ChatViewModel: BitchatDelegate {
if messageToStore.deliveryStatus == nil || messageToStore.deliveryStatus == .sending {
// Mark it as delivered since we received it
messageToStore.deliveryStatus = .delivered(to: nickname, at: Date())
print("[Delivery] Setting delivery status for incoming message \(message.id) to delivered (was: \(message.deliveryStatus?.displayText ?? "nil"))")
}
}
@@ -2019,7 +1974,6 @@ extension ChatViewModel: BitchatDelegate {
readerNickname: nickname
)
meshService.sendReadReceipt(receipt, to: peerID)
print("[Delivery] Sending immediate read receipt for message \(message.id) from \(message.sender) to current peer \(peerID)")
// Also check if there are other unread messages from this peer
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
@@ -2318,13 +2272,11 @@ extension ChatViewModel: BitchatDelegate {
func didReceiveDeliveryAck(_ ack: DeliveryAck) {
// Find the message and update its delivery status
print("[Delivery] Received ACK for message \(ack.originalMessageID) from \(ack.recipientNickname)")
updateMessageDeliveryStatus(ack.originalMessageID, status: .delivered(to: ack.recipientNickname, at: ack.timestamp))
}
func didReceiveReadReceipt(_ receipt: ReadReceipt) {
// Find the message and update its read status
print("[Delivery] Received READ receipt for message \(receipt.originalMessageID) from \(receipt.readerNickname)")
updateMessageDeliveryStatus(receipt.originalMessageID, status: .read(by: receipt.readerNickname, at: receipt.timestamp))
}
@@ -2333,7 +2285,6 @@ extension ChatViewModel: BitchatDelegate {
}
private func updateMessageDeliveryStatus(_ messageID: String, status: DeliveryStatus) {
print("[Delivery] Updating message \(messageID) to status: \(status)")
// Helper function to check if we should skip this update
func shouldSkipUpdate(currentStatus: DeliveryStatus?, newStatus: DeliveryStatus) -> Bool {
@@ -2342,10 +2293,8 @@ extension ChatViewModel: BitchatDelegate {
// Don't downgrade from read to delivered
switch (current, newStatus) {
case (.read, .delivered):
print("[Delivery] Skipping update - message already marked as read")
return true
case (.read, .sent):
print("[Delivery] Skipping update - message already marked as read")
return true
default:
return false
@@ -2359,7 +2308,6 @@ extension ChatViewModel: BitchatDelegate {
var updatedMessage = messages[index]
updatedMessage.deliveryStatus = status
messages[index] = updatedMessage
print("[Delivery] Updated message in main messages")
}
}
@@ -2373,7 +2321,6 @@ extension ChatViewModel: BitchatDelegate {
updatedMessage.deliveryStatus = status
chatMessages[index] = updatedMessage
updatedPrivateChats[peerID] = chatMessages
print("[Delivery] Updated message in private chat with \(peerID)")
}
}
}
bitchat/Views/ContentView.swift
+1 -18
View File
@@ -433,12 +433,7 @@ struct ContentView: View {
if let privatePeer = viewModel.selectedPrivateChatPeer {
let msgs = viewModel.getPrivateChatMessages(for: privatePeer)
// Log what we're showing
if !msgs.isEmpty {
print("[UI] Showing \(msgs.count) messages in private chat with \(privatePeer)")
for (idx, msg) in msgs.enumerated() {
print("[UI] Message \(idx): from \(msg.sender), status: \(msg.deliveryStatus?.displayText ?? "none")")
}
}
// Removed debug logging
return msgs
} else if let currentRoom = viewModel.currentRoom {
return viewModel.getRoomMessages(currentRoom)
@@ -502,7 +497,6 @@ struct ContentView: View {
// Delivery status indicator for private messages
if message.isPrivate && message.sender == viewModel.nickname,
let status = message.deliveryStatus {
let _ = print("[UI] Message \(message.id) has status: \(status)")
DeliveryStatusView(status: status, colorScheme: colorScheme)
.padding(.leading, 4)
.alignmentGuide(.firstTextBaseline) { _ in 12 }
@@ -539,10 +533,8 @@ struct ContentView: View {
.onChange(of: viewModel.selectedPrivateChatPeer) { newPeerID in
// When switching to a private chat, send read receipts
if let peerID = newPeerID {
print("[UI] Selected private chat peer changed to \(peerID)")
// Small delay to ensure messages are loaded
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
print("[UI] Triggering markPrivateMessagesAsRead for peer \(peerID)")
viewModel.markPrivateMessagesAsRead(from: peerID)
}
}
@@ -550,17 +542,14 @@ struct ContentView: View {
.onAppear {
// Also check when view appears
if let peerID = viewModel.selectedPrivateChatPeer {
print("[UI] Messages view appeared with selected peer \(peerID)")
// Try multiple times to ensure read receipts are sent
viewModel.markPrivateMessagesAsRead(from: peerID)
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
print("[UI] Triggering markPrivateMessagesAsRead on appear (0.1s) for peer \(peerID)")
viewModel.markPrivateMessagesAsRead(from: peerID)
}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
print("[UI] Triggering markPrivateMessagesAsRead on appear (0.5s) for peer \(peerID)")
viewModel.markPrivateMessagesAsRead(from: peerID)
}
}
@@ -1142,9 +1131,6 @@ struct DeliveryStatusView: View {
}
.foregroundColor(textColor.opacity(0.8))
.help("Delivered to \(nickname)")
.onAppear {
print("[UI] Showing GREEN checkmarks for delivered status to \(nickname)")
}
case .read(let nickname, _):
HStack(spacing: -2) {
@@ -1155,9 +1141,6 @@ struct DeliveryStatusView: View {
}
.foregroundColor(Color(red: 0.0, green: 0.478, blue: 1.0)) // Bright blue
.help("Read by \(nickname)")
.onAppear {
print("[UI] Showing BLUE checkmarks for read status by \(nickname)")
}
case .failed(let reason):
Image(systemName: "exclamationmark.triangle")