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

Fix remaining Swift 6 warnings about unused results

Browse Source 
- Add explicit discarding of Set.remove results in sync blocks
- Add explicit discarding of Dictionary.removeValue results
- Ensures completely clean builds with no warnings

All instances of remove/removeValue inside sync blocks now
explicitly discard their return values to satisfy Swift 6.
This commit is contained in:
jack
2025-07-22 11:40:28 +02:00
parent 9e035c9c14
commit 128b19496d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Services/BluetoothMeshService.swift
+9 -9
View File
@@ -884,7 +884,7 @@ class BluetoothMeshService: NSObject {
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in
// Remove old peer ID from active peers and announcedPeers // Remove old peer ID from active peers and announcedPeers
self?.collectionsQueue.sync(flags: .barrier) { self?.collectionsQueue.sync(flags: .barrier) {
self?.activePeers.remove(oldPeerID) _ = self?.activePeers.remove(oldPeerID)
// Don't pre-insert the new peer ID - let the announce packet handle it // Don't pre-insert the new peer ID - let the announce packet handle it
// This ensures the connect message logic works properly // This ensures the connect message logic works properly
} }
@@ -2042,7 +2042,7 @@ class BluetoothMeshService: NSObject {
// IMPORTANT: Remove old peer ID from activePeers to prevent duplicates // IMPORTANT: Remove old peer ID from activePeers to prevent duplicates
collectionsQueue.sync(flags: .barrier) { collectionsQueue.sync(flags: .barrier) {
if self.activePeers.contains(tempID) { if self.activePeers.contains(tempID) {
self.activePeers.remove(tempID) _ = self.activePeers.remove(tempID)
} }
} }
@@ -2159,8 +2159,8 @@ class BluetoothMeshService: NSObject {
if String(data: packet.payload, encoding: .utf8) != nil { if String(data: packet.payload, encoding: .utf8) != nil {
// Remove from active peers with proper locking // Remove from active peers with proper locking
collectionsQueue.sync(flags: .barrier) { collectionsQueue.sync(flags: .barrier) {
self.activePeers.remove(senderID) _ = self.activePeers.remove(senderID)
self.peerNicknames.removeValue(forKey: senderID) _ = self.peerNicknames.removeValue(forKey: senderID)
} }
announcedPeers.remove(senderID) announcedPeers.remove(senderID)
@@ -2847,8 +2847,8 @@ extension BluetoothMeshService: CBCentralManagerDelegate {
if removed { if removed {
} }
announcedPeers.remove(peerID) _ = announcedPeers.remove(peerID)
announcedToPeers.remove(peerID) _ = announcedToPeers.remove(peerID)
} else { } else {
} }
@@ -3648,8 +3648,8 @@ extension BluetoothMeshService: CBPeripheralManagerDelegate {
// Clean up state for incompatible peer // Clean up state for incompatible peer
collectionsQueue.sync(flags: .barrier) { collectionsQueue.sync(flags: .barrier) {
self.activePeers.remove(peerID) _ = self.activePeers.remove(peerID)
self.peerNicknames.removeValue(forKey: peerID) _ = self.peerNicknames.removeValue(forKey: peerID)
} }
announcedPeers.remove(peerID) announcedPeers.remove(peerID)
@@ -3913,7 +3913,7 @@ extension BluetoothMeshService: CBPeripheralManagerDelegate {
// Clean up old entries after 10 seconds // Clean up old entries after 10 seconds
DispatchQueue.main.asyncAfter(deadline: .now() + 10.0) { [weak self] in DispatchQueue.main.asyncAfter(deadline: .now() + 10.0) { [weak self] in
self?.collectionsQueue.sync(flags: .barrier) { self?.collectionsQueue.sync(flags: .barrier) {
self?.recentlySentMessages.remove(sendKey) _ = self?.recentlySentMessages.remove(sendKey)
} }
} }
return false return false