don't need two inits

This commit is contained in:
Erik 2015-10-16 12:47:33 -04:00
parent aa368f92cf
commit a6c700230d
2 changed files with 5 additions and 9 deletions

View File

@ -70,15 +70,12 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
private(set) var connected = false private(set) var connected = false
private(set) var polling = true private(set) var polling = true
private(set) var websocket = false private(set) var websocket = false
public init(client: SocketEngineClient, sessionDelegate: NSURLSessionDelegate?) { public init(client: SocketEngineClient, opts: NSDictionary?) {
self.client = client self.client = client
self.session = NSURLSession(configuration: NSURLSessionConfiguration.defaultSessionConfiguration(), session = NSURLSession(configuration: .defaultSessionConfiguration(),
delegate: sessionDelegate, delegateQueue: workQueue) delegate: opts?["sessionDelegate"] as? NSURLSessionDelegate,
} delegateQueue: workQueue)
public convenience init(client: SocketEngineClient, opts: NSDictionary?) {
self.init(client: client, sessionDelegate: opts?["sessionDelegate"] as? NSURLSessionDelegate)
forceWebsockets = opts?["forceWebsockets"] as? Bool ?? false forceWebsockets = opts?["forceWebsockets"] as? Bool ?? false
forcePolling = opts?["forcePolling"] as? Bool ?? false forcePolling = opts?["forcePolling"] as? Bool ?? false
cookies = opts?["cookies"] as? [NSHTTPCookie] cookies = opts?["cookies"] as? [NSHTTPCookie]

View File

@ -34,7 +34,6 @@ import Foundation
var urlWebSocket: String {get} var urlWebSocket: String {get}
var ws: WebSocket? {get} var ws: WebSocket? {get}
init(client: SocketEngineClient, sessionDelegate: NSURLSessionDelegate?)
init(client: SocketEngineClient, opts: NSDictionary?) init(client: SocketEngineClient, opts: NSDictionary?)
func close(fast fast: Bool) func close(fast fast: Bool)