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

Merge branch 'fix/read-receipt-consistency'

Browse Source
This commit is contained in:
jack
2025-07-25 18:10:10 +02:00
parent df83f716d1 6afef8466a
commit e57bfad843
2 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat.xcodeproj/project.pbxproj
+2 -2
View File
@@ -785,7 +785,7 @@
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = 1;
}; };
name = Debug; name = Debug;
}; };
@@ -841,7 +841,7 @@
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = 1;
}; };
name = Release; name = Release;
}; };
bitchat/Services/BluetoothMeshService.swift
+41 -28
View File
@@ -1502,41 +1502,35 @@ class BluetoothMeshService: NSObject {
// Check if we have a Noise session with this peer // Check if we have a Noise session with this peer
// Use noiseService directly // Use noiseService directly
if self.noiseService.hasEstablishedSession(with: recipientID) { if self.noiseService.hasEstablishedSession(with: recipientID) {
// Use Noise encryption - send as Noise encrypted message // Use Noise encryption - encrypt only the receipt payload directly
do { do {
// Create inner read receipt packet // Create a special payload that indicates this is a read receipt
let innerPacket = BitchatPacket( // Format: [1 byte type marker] + [receipt binary data]
type: MessageType.readReceipt.rawValue, var receiptPayload = Data()
receiptPayload.append(MessageType.readReceipt.rawValue) // Type marker
receiptPayload.append(receiptData) // Receipt binary data
// Encrypt only the payload (not a full packet)
let encryptedPayload = try noiseService.encrypt(receiptPayload, for: recipientID)
// Create outer Noise packet with the encrypted payload
let outerPacket = BitchatPacket(
type: MessageType.noiseEncrypted.rawValue,
senderID: Data(hexString: self.myPeerID) ?? Data(), senderID: Data(hexString: self.myPeerID) ?? Data(),
recipientID: Data(hexString: recipientID) ?? Data(), recipientID: Data(hexString: recipientID) ?? Data(),
timestamp: UInt64(Date().timeIntervalSince1970 * 1000), timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
payload: receiptData, payload: encryptedPayload,
signature: nil, signature: nil,
ttl: 3 ) ttl: 3 )
// Encrypt the entire inner packet SecureLogger.log("Sending encrypted read receipt for message \(receipt.originalMessageID) to \(recipientID)", category: SecureLogger.noise, level: .info)
if let innerData = innerPacket.toBinaryData() {
let encryptedInnerData = try noiseService.encrypt(innerData, for: recipientID) // Try direct delivery first for read receipts
if !self.sendDirectToRecipient(outerPacket, recipientPeerID: recipientID) {
// Create outer Noise packet // Recipient not directly connected, use selective relay
let outerPacket = BitchatPacket( SecureLogger.log("Recipient \(recipientID) not directly connected for read receipt, using relay",
type: MessageType.noiseEncrypted.rawValue, category: SecureLogger.session, level: .info)
senderID: Data(hexString: self.myPeerID) ?? Data(), self.sendViaSelectiveRelay(outerPacket, recipientPeerID: recipientID)
recipientID: Data(hexString: recipientID) ?? Data(),
timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
payload: encryptedInnerData,
signature: nil,
ttl: 3 )
SecureLogger.log("Sending encrypted read receipt for message \(receipt.originalMessageID) to \(recipientID)", category: SecureLogger.noise, level: .info)
// Try direct delivery first for read receipts
if !self.sendDirectToRecipient(outerPacket, recipientPeerID: recipientID) {
// Recipient not directly connected, use selective relay
SecureLogger.log("Recipient \(recipientID) not directly connected for read receipt, using relay",
category: SecureLogger.session, level: .info)
self.sendViaSelectiveRelay(outerPacket, recipientPeerID: recipientID)
}
} }
} catch { } catch {
SecureLogger.logError(error, context: "Failed to encrypt read receipt via Noise for \(recipientID)", category: SecureLogger.encryption) SecureLogger.logError(error, context: "Failed to encrypt read receipt via Noise for \(recipientID)", category: SecureLogger.encryption)
@@ -5358,6 +5352,25 @@ extension BluetoothMeshService: CBPeripheralManagerDelegate {
SecureLogger.log("Failed to decode delivery ACK via Noise - data size: \(ackData.count)", category: SecureLogger.session, level: .warning) SecureLogger.log("Failed to decode delivery ACK via Noise - data size: \(ackData.count)", category: SecureLogger.session, level: .warning)
} }
} }
// Check if this is a read receipt with the new format
else if typeMarker == MessageType.readReceipt.rawValue {
// Extract the receipt binary data (skip the type marker)
let receiptData = decryptedData.dropFirst()
// Decode the read receipt from binary
if let receipt = ReadReceipt.fromBinaryData(receiptData) {
SecureLogger.log("Received binary read receipt via Noise: \(receipt.originalMessageID) from \(receipt.readerNickname)", category: SecureLogger.session, level: .debug)
// Process the read receipt
DispatchQueue.main.async {
self.delegate?.didReceiveReadReceipt(receipt)
}
return
} else {
SecureLogger.log("Failed to decode read receipt via Noise - data size: \(receiptData.count)", category: SecureLogger.session, level: .warning)
}
}
} }
// Try to parse as a full inner packet (for backward compatibility and other message types) // Try to parse as a full inner packet (for backward compatibility and other message types)