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

minor improvements using let / guard

Browse Source
This commit is contained in:
Lukas Schmidt 2015-08-02 18:23:48 +02:00
parent 94a3844181
commit 92367fc796
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
SocketIOClientSwift/SocketEngine.swift
View File

@ -325,8 +325,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
let req = NSMutableURLRequest(URL: NSURL(string: urlPolling! + "&sid=\(sid)")!) let req = NSMutableURLRequest(URL: NSURL(string: urlPolling! + "&sid=\(sid)")!)
if cookies != nil { if let cookies = cookies {
let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies!) let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies)
req.allHTTPHeaderFields = headers req.allHTTPHeaderFields = headers
} }
@ -375,8 +375,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
} }
private func handleClose() { private func handleClose() {
if polling { if let client = client where polling == true {
client?.engineDidClose("Disconnect") client.engineDidClose("Disconnect")
} }
} }
@ -494,8 +494,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
reqPolling.allHTTPHeaderFields = headers reqPolling.allHTTPHeaderFields = headers
} }
if extraHeaders != nil { if let extraHeaders = extraHeaders {
for (headerName, value) in extraHeaders! { for (headerName, value) in extraHeaders {
reqPolling.setValue(value, forHTTPHeaderField: headerName) reqPolling.setValue(value, forHTTPHeaderField: headerName)
} }
} }
@ -505,10 +505,9 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
// Translatation of engine.io-parser#decodePayload // Translatation of engine.io-parser#decodePayload
private func parsePollingMessage(str:String) { private func parsePollingMessage(str:String) {
if str.characters.count == 1 { guard str.characters.count == 1 else {
return return
} }
// println(str) // println(str)
let strArray = Array(str.characters) let strArray = Array(str.characters)
@ -633,8 +632,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
postWait.append(strMsg) postWait.append(strMsg)
if datas != nil { if let datas = datas {
for data in datas! { for data in datas {
let (_, b64Data) = createBinaryDataForSend(data) let (_, b64Data) = createBinaryDataForSend(data)
postWait.append(b64Data!) postWait.append(b64Data!)
@ -654,8 +653,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
ws?.writeString("\(type.rawValue)\(str)") ws?.writeString("\(type.rawValue)\(str)")
if datas != nil { if let datas = datas {
for data in datas! { for data in datas {
let (data, _) = createBinaryDataForSend(data) let (data, _) = createBinaryDataForSend(data)
if data != nil { if data != nil {
ws?.writeData(data!) ws?.writeData(data!)
@ -666,7 +665,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
// Starts the ping timer // Starts the ping timer
private func startPingTimer() { private func startPingTimer() {
if pingInterval == nil { guard pingInterval != nil else {
return return
} }
@ -719,8 +718,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
if let pType = PacketType(rawValue: type) { if let pType = PacketType(rawValue: type) {
var arr = [NSData]() var arr = [NSData]()
if data != nil { if let data = data {
for d in data! { for d in data {
arr.append(d as! NSData) arr.append(d as! NSData)
} }
} }