From a6c700230db387eb4a10d74113cc7d215ca4f713 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 16 Oct 2015 12:47:33 -0400 Subject: [PATCH] don't need two inits --- SocketIOClientSwift/SocketEngine.swift | 13 +++++-------- SocketIOClientSwift/SocketEngineSpec.swift | 1 - 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift index beb0938..2eff23e 100644 --- a/SocketIOClientSwift/SocketEngine.swift +++ b/SocketIOClientSwift/SocketEngine.swift @@ -70,15 +70,12 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate { private(set) var connected = false private(set) var polling = true private(set) var websocket = false - - public init(client: SocketEngineClient, sessionDelegate: NSURLSessionDelegate?) { + + public init(client: SocketEngineClient, opts: NSDictionary?) { self.client = client - self.session = NSURLSession(configuration: NSURLSessionConfiguration.defaultSessionConfiguration(), - delegate: sessionDelegate, delegateQueue: workQueue) - } - - public convenience init(client: SocketEngineClient, opts: NSDictionary?) { - self.init(client: client, sessionDelegate: opts?["sessionDelegate"] as? NSURLSessionDelegate) + session = NSURLSession(configuration: .defaultSessionConfiguration(), + delegate: opts?["sessionDelegate"] as? NSURLSessionDelegate, + delegateQueue: workQueue) forceWebsockets = opts?["forceWebsockets"] as? Bool ?? false forcePolling = opts?["forcePolling"] as? Bool ?? false cookies = opts?["cookies"] as? [NSHTTPCookie] diff --git a/SocketIOClientSwift/SocketEngineSpec.swift b/SocketIOClientSwift/SocketEngineSpec.swift index 34b8510..46221ba 100644 --- a/SocketIOClientSwift/SocketEngineSpec.swift +++ b/SocketIOClientSwift/SocketEngineSpec.swift @@ -34,7 +34,6 @@ import Foundation var urlWebSocket: String {get} var ws: WebSocket? {get} - init(client: SocketEngineClient, sessionDelegate: NSURLSessionDelegate?) init(client: SocketEngineClient, opts: NSDictionary?) func close(fast fast: Bool)