Merge pull request #5 from rfree18/master

Peer connection bug fix

Author: insidegui

Sources/MultipeerKit/Internal API/MultipeerConnection.swift

@@ -120,17 +120,15 @@ extension MultipeerConnection: MCSessionDelegate {
 
         let handler = invitationCompletionHandlers[peerID]
 
-        defer { invitationCompletionHandlers[peerID] = nil }
-
         DispatchQueue.main.async {
             switch state {
             case .connected:
                 handler?(.success(peer))
-
+                self.invitationCompletionHandlers[peerID] = nil
                 self.didConnectToPeer?(peer)
             case .notConnected:
                 handler?(.failure(MultipeerError(localizedDescription: "Failed to connect to peer.")))
-
+                self.invitationCompletionHandlers[peerID] = nil
                 self.didDisconnectFromPeer?(peer)
             case .connecting:
                 break

Sources/MultipeerKit/Public API/MultipeerTransceiver.swift

@@ -151,7 +151,7 @@ public final class MultipeerTransceiver {
     }
 
     private func handlePeerRemoved(_ peer: Peer) {
-        guard let idx = availablePeers.firstIndex(of: peer) else { return }
+        guard let idx = availablePeers.firstIndex(where: { $0.underlyingPeer == peer.underlyingPeer }) else { return }
 
         availablePeers.remove(at: idx)
     }
@@ -165,7 +165,7 @@ public final class MultipeerTransceiver {
     }
 
     private func setConnected(_ connected: Bool, on peer: Peer) {
-        guard let idx = availablePeers.firstIndex(of: peer) else { return }
+        guard let idx = availablePeers.firstIndex(where: { $0.underlyingPeer == peer.underlyingPeer }) else { return }
 
         var mutablePeer = availablePeers[idx]
         mutablePeer.isConnected = connected