mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 09:05:20 +00:00
Fix handshake deadlock after decryption failure
Always accept handshake initiations even with valid sessions, as the peer must have cleared their session for a good reason (e.g., decryption failure). This prevents deadlock where one peer has no session while the other maintains an invalid one.
This commit is contained in:
@@ -859,9 +859,11 @@ class ChatViewModel: ObservableObject {
|
||||
return primaryColor
|
||||
} else if let peerID = message.senderPeerID ?? getPeerIDForNickname(message.sender),
|
||||
let rssi = meshService.getPeerRSSI()[peerID] {
|
||||
// Use actual RSSI value
|
||||
return getRSSIColor(rssi: rssi.intValue, colorScheme: colorScheme)
|
||||
} else {
|
||||
return primaryColor.opacity(0.9)
|
||||
// No RSSI data available - use a neutral color
|
||||
return primaryColor.opacity(0.7)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -960,9 +962,11 @@ class ChatViewModel: ObservableObject {
|
||||
senderColor = primaryColor
|
||||
} else if let peerID = message.senderPeerID ?? getPeerIDForNickname(message.sender),
|
||||
let rssi = meshService.getPeerRSSI()[peerID] {
|
||||
// Use actual RSSI value
|
||||
senderColor = getRSSIColor(rssi: rssi.intValue, colorScheme: colorScheme)
|
||||
} else {
|
||||
senderColor = primaryColor.opacity(0.9)
|
||||
// No RSSI data available - use a neutral color
|
||||
senderColor = primaryColor.opacity(0.7)
|
||||
}
|
||||
|
||||
senderStyle.foregroundColor = senderColor
|
||||
@@ -1103,9 +1107,11 @@ class ChatViewModel: ObservableObject {
|
||||
senderColor = primaryColor
|
||||
} else if let peerID = message.senderPeerID ?? getPeerIDForNickname(message.sender),
|
||||
let rssi = meshService.getPeerRSSI()[peerID] {
|
||||
// Use actual RSSI value
|
||||
senderColor = getRSSIColor(rssi: rssi.intValue, colorScheme: colorScheme)
|
||||
} else {
|
||||
senderColor = primaryColor.opacity(0.9)
|
||||
// No RSSI data available - use a neutral color
|
||||
senderColor = primaryColor.opacity(0.7)
|
||||
}
|
||||
|
||||
senderStyle.foregroundColor = senderColor
|
||||
|
||||
Reference in New Issue
Block a user