Skip to content

Commit 3757574

Browse files
committed
Extra cleanup when disconnecting
1 parent 36b4264 commit 3757574

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Sources/PusherConnection.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public typealias PusherEventJSON = [String: AnyObject]
6464
}
6565

6666
self!.delegate?.debugLog?(message: "[PUSHER DEBUG] Network unreachable")
67-
self!.setConnectionStateToDisconnectedAndResetChannelSubscribedStates()
67+
self!.setConnectionStateToDisconnectedAndReset()
6868
}
6969
return reachability
7070
}()
@@ -347,11 +347,14 @@ public typealias PusherEventJSON = [String: AnyObject]
347347
}
348348
}
349349

350-
fileprivate func setConnectionStateToDisconnectedAndResetChannelSubscribedStates() {
350+
fileprivate func setConnectionStateToDisconnectedAndReset() {
351351
updateConnectionState(to: .disconnected)
352352
for (_, channel) in self.channels.channels {
353353
channel.subscribed = false
354354
}
355+
socketConnected = false
356+
connectionEstablishedMessageReceived = false
357+
socketId = nil
355358
attemptReconnect()
356359
}
357360

@@ -392,7 +395,7 @@ public typealias PusherEventJSON = [String: AnyObject]
392395
@objc fileprivate func cleanupAfterNoPongResponse() {
393396
pongResponseTimeoutTimer?.invalidate()
394397
pongResponseTimeoutTimer = nil
395-
setConnectionStateToDisconnectedAndResetChannelSubscribedStates()
398+
setConnectionStateToDisconnectedAndReset()
396399
}
397400

398401
/**

0 commit comments

Comments
 (0)