From 6401c1969cf640170249a1e146bf41ceff7642af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20B=C3=B6ttger?= Date: Thu, 19 Feb 2026 20:53:48 +0100 Subject: [PATCH] Allow multiple incoming connections --- .../Connection/InboundNearbyConnection.swift | 6 ------ .../Connection/NearbyConnectionManager.swift | 13 ------------- 2 files changed, 19 deletions(-) diff --git a/NearbyShare/Connection/InboundNearbyConnection.swift b/NearbyShare/Connection/InboundNearbyConnection.swift index 412da68..0a8ba3f 100644 --- a/NearbyShare/Connection/InboundNearbyConnection.swift +++ b/NearbyShare/Connection/InboundNearbyConnection.swift @@ -539,12 +539,6 @@ class InboundNearbyConnection: NearbyConnection { let acceptAutomatically = isAuthenticated || Settings.sharedInstance.automaticallyAcceptFiles DispatchQueue.main.async { - if !NearbyConnectionManager.shared.claimIncomingTransfer(id: self.id) { - log("[InboundNearbyConnection \(self.id)] Another transfer is active. Rejecting incoming transfer.") - self.rejectTransfer() - return - } - if acceptAutomatically { self.delegate?.obtainedUserConsentAutomatically(transfer: metadata, device: self.remoteDeviceInfo!, connection: self) self.submitUserConsent(accepted: true, trustDevice: false) diff --git a/NearbyShare/Connection/NearbyConnectionManager.swift b/NearbyShare/Connection/NearbyConnectionManager.swift index 5385420..6811682 100644 --- a/NearbyShare/Connection/NearbyConnectionManager.swift +++ b/NearbyShare/Connection/NearbyConnectionManager.swift @@ -29,7 +29,6 @@ public class NearbyConnectionManager: NSObject, NetServiceDelegate, InboundNearb private var tcpListener: NWListener private var mdnsServices: [NetService] = [] private var incomingConnections: [String: InboundNearbyConnection] = [:] - private var activeIncomingTransferID: String? private var foundServices: [String: FoundServiceInfo] = [:] private var outboundAppDelegates: [OutboundAppDelegate] = [] private var inboundAppDelegates: [InboundAppDelegate] = [] @@ -341,9 +340,6 @@ public class NearbyConnectionManager: NSObject, NetServiceDelegate, InboundNearb func connectionWasTerminated(connection: InboundNearbyConnection, savedFiles: [URL], error: Error?) { - if activeIncomingTransferID == connection.id { - activeIncomingTransferID = nil - } incomingConnections.removeValue(forKey: connection.id) if !connection.wasUserRejected { @@ -486,15 +482,6 @@ public class NearbyConnectionManager: NSObject, NetServiceDelegate, InboundNearb } } - func claimIncomingTransfer(id: String) -> Bool { - if let activeIncomingTransferID, activeIncomingTransferID != id { - return false - } - activeIncomingTransferID = id - return true - } - - private func endpointID(for service: NWBrowser.Result) -> String? { guard case let NWEndpoint.service(name: serviceName, type: _, domain: _, interface: _) = service.endpoint else { return nil } guard let nameData = Data.dataFromUrlSafeBase64(serviceName) else { return nil }