cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We're always connecting anyway

Browse Source
This commit is contained in:
Erik 2016-01-17 10:29:10 -05:00
parent 5cab7dbb2f
commit c211ab140d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/SocketEngine.swift
View File

@ -227,7 +227,7 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
return (urlPolling, urlWebSocket) return (urlPolling, urlWebSocket)
} }
private func createWebsocketAndConnect(connect: Bool) { private func createWebsocketAndConnect() {
let wsUrl = urlWebSocket + (sid == "" ? "" : "&sid=\(sid)") let wsUrl = urlWebSocket + (sid == "" ? "" : "&sid=\(sid)")
ws = WebSocket(url: NSURL(string: wsUrl)!) ws = WebSocket(url: NSURL(string: wsUrl)!)
@ -250,9 +250,7 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
ws?.delegate = self ws?.delegate = self
ws?.selfSignedSSL = selfSigned ws?.selfSignedSSL = selfSigned
if connect { ws?.connect()
ws?.connect()
}
} }
public func didError(error: String) { public func didError(error: String) {
@ -338,7 +336,7 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
} }
if !forcePolling && !forceWebsockets && upgradeWs { if !forcePolling && !forceWebsockets && upgradeWs {
createWebsocketAndConnect(true) createWebsocketAndConnect()
} }
@ -384,7 +382,7 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
if forceWebsockets { if forceWebsockets {
polling = false polling = false
websocket = true websocket = true
createWebsocketAndConnect(true) createWebsocketAndConnect()
return return
} }