Add ReconnectingWhenNetworkBecomesReachable connection state

hamchapman · hamchapman · commit bc0d1953b136 · 2016-07-11T17:05:50.000+01:00
diff --git a/Source/PusherConnection.swift b/Source/PusherConnection.swift
@@ -31,7 +31,7 @@ public class PusherConnection {
         let reachability = try? Reachability.reachabilityForInternetConnection()
         reachability?.whenReachable = { [unowned self] reachability in
             self.debugLogger?("[PUSHER DEBUG] Network reachable")
-            if self.connectionState == .Disconnected {
+            if self.connectionState == .Disconnected || self.connectionState == .ReconnectingWhenNetworkBecomesReachable {
                 self.attemptReconnect()
             }
         }
@@ -669,6 +669,7 @@ public enum ConnectionState {
     case Disconnecting
     case Disconnected
     case Reconnecting
+    case ReconnectingWhenNetworkBecomesReachable
 }
 
 public protocol ConnectionStateChangeDelegate: class {
diff --git a/Source/PusherWebsocketDelegate.swift b/Source/PusherWebsocketDelegate.swift
@@ -58,7 +58,7 @@ extension PusherConnection: WebSocketDelegate {
 
         guard let reachability = self.reachability where reachability.isReachable() else {
             self.debugLogger?("[PUSHER DEBUG] Network unreachable so waiting to attempt reconnect")
-            return updateConnectionState(.Disconnected)
+            return updateConnectionState(.ReconnectingWhenNetworkBecomesReachable)
         }
 
         if connectionState != .Reconnecting {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public class PusherConnection {`
`31`	`31`	`let reachability = try? Reachability.reachabilityForInternetConnection()`
`32`	`32`	`reachability?.whenReachable = { [unowned self] reachability in`
`33`	`33`	`self.debugLogger?("[PUSHER DEBUG] Network reachable")`
`34`		`- if self.connectionState == .Disconnected {`
	`34`	`+ if self.connectionState == .Disconnected \|\| self.connectionState == .ReconnectingWhenNetworkBecomesReachable {`
`35`	`35`	`self.attemptReconnect()`
`36`	`36`	`}`
`37`	`37`	`}`
`@@ -669,6 +669,7 @@ public enum ConnectionState {`
`669`	`669`	`case Disconnecting`
`670`	`670`	`case Disconnected`
`671`	`671`	`case Reconnecting`
	`672`	`+ case ReconnectingWhenNetworkBecomesReachable`
`672`	`673`	`}`
`673`	`674`
`674`	`675`	`public protocol ConnectionStateChangeDelegate: class {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ extension PusherConnection: WebSocketDelegate {`
`58`	`58`
`59`	`59`	`guard let reachability = self.reachability where reachability.isReachable() else {`
`60`	`60`	`self.debugLogger?("[PUSHER DEBUG] Network unreachable so waiting to attempt reconnect")`
`61`		`- return updateConnectionState(.Disconnected)`
	`61`	`+ return updateConnectionState(.ReconnectingWhenNetworkBecomesReachable)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if connectionState != .Reconnecting {`