Merge pull request #199 from PorterHoskins/self-retain-reachability

Capture self reference before using self reference in Reachability closures

Author: TomKemp

Sources/PusherConnection.swift

@@ -42,42 +42,42 @@ public typealias PusherEventJSON = [String: AnyObject]
     open lazy var reachability: Reachability? = {
         let reachability = Reachability.init()
         reachability?.whenReachable = { [weak self] reachability in
-            guard self != nil else {
+            guard let strongSelf = self else {
                 print("Your Pusher instance has probably become deallocated. See https://github.com/pusher/pusher-websocket-swift/issues/109 for more information")
                 return
             }
 
-            self!.delegate?.debugLog?(message: "[PUSHER DEBUG] Network reachable")
+            strongSelf.delegate?.debugLog?(message: "[PUSHER DEBUG] Network reachable")
 
-            switch self!.connectionState {
+            switch strongSelf.connectionState {
             case .disconnecting, .connecting, .reconnecting:
                 // If in one of these states then part of the connection, reconnection, or explicit
                 // disconnection process is underway, so do nothing
                 return
             case .disconnected:
                 // If already disconnected then reset connection and try to reconnect, provided the
                 // state isn't disconnected because of an intentional disconnection
-                if !self!.intentionalDisconnect { self!.resetConnectionAndAttemptReconnect() }
+                if !strongSelf.intentionalDisconnect { strongSelf.resetConnectionAndAttemptReconnect() }
                 return
             case .connected:
                 // If already connected then we assume that there was a missed network event that
                 // led to a bad connection so we move to the disconnected state and then attempt
                 // reconnection
-                self!.delegate?.debugLog?(
+                strongSelf.delegate?.debugLog?(
                     message: "[PUSHER DEBUG] Connection state is \(self!.connectionState.stringValue()) but received network reachability change so going to call attemptReconnect"
                 )
-                self!.resetConnectionAndAttemptReconnect()
+                strongSelf.resetConnectionAndAttemptReconnect()
                 return
             }
         }
         reachability?.whenUnreachable = { [weak self] reachability in
-            guard self != nil else {
+            guard let strongSelf = self else {
                 print("Your Pusher instance has probably become deallocated. See https://github.com/pusher/pusher-websocket-swift/issues/109 for more information")
                 return
             }
 
-            self!.delegate?.debugLog?(message: "[PUSHER DEBUG] Network unreachable")
-            self!.resetConnectionAndAttemptReconnect()
+            strongSelf.delegate?.debugLog?(message: "[PUSHER DEBUG] Network unreachable")
+            strongSelf.resetConnectionAndAttemptReconnect()
         }
         return reachability
     }()