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

Revert "add case for opening poll"

Browse Source 
This reverts commit 0acb7421cc0fca88f223851a5e68ce3e072c6285.
This commit is contained in:
Erik 2015-12-02 12:32:31 -05:00
parent 0acb7421cc
commit c74858fd5d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SocketIOClientSwift/SocketEngine.swift
View File

@ -333,7 +333,6 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
} }
} catch { } catch {
DefaultSocketLogger.Logger.error("Error parsing open packet", type: logType) DefaultSocketLogger.Logger.error("Error parsing open packet", type: logType)
client?.didError("Error parsing open packet")
return return
} }
@ -409,7 +408,7 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
} }
} }
doLongPoll(reqPolling, open: true) doLongPoll(reqPolling)
} }
private func parseEngineData(data: NSData) { private func parseEngineData(data: NSData) {
@ -581,7 +580,7 @@ extension SocketEngine {
session?.dataTaskWithRequest(req, completionHandler: callback).resume() session?.dataTaskWithRequest(req, completionHandler: callback).resume()
} }
private func doLongPoll(req: NSMutableURLRequest, open: Bool = false) { private func doLongPoll(req: NSMutableURLRequest) {
doRequest(req) {[weak self] data, res, err in doRequest(req) {[weak self] data, res, err in
guard let this = self else {return} guard let this = self else {return}
@ -599,13 +598,9 @@ extension SocketEngine {
if let str = NSString(data: data!, encoding: NSUTF8StringEncoding) as? String { if let str = NSString(data: data!, encoding: NSUTF8StringEncoding) as? String {
dispatch_async(this.parseQueue) {[weak this] in dispatch_async(this.parseQueue) {[weak this] in
if open {
this?.handleOpen(str)
} else {
this?.parsePollingMessage(str) this?.parsePollingMessage(str)
} }
} }
}
this.waitingForPoll = false this.waitingForPoll = false