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

Merge branch 'socketio/swift-2' into tests

Browse Source
This commit is contained in:
Lukas Schmidt 2015-08-02 20:05:43 +02:00
commit 6650afd3e4
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SocketIOClientSwift/SocketPacket.swift
View File

@ -98,16 +98,15 @@ struct SocketPacket {
for arg in data { for arg in data {
if arg is NSDictionary || arg is [AnyObject] { if arg is NSDictionary || arg is [AnyObject] {
let jsonSend: NSData?
do { do {
jsonSend = try NSJSONSerialization.dataWithJSONObject(arg, let jsonSend = try NSJSONSerialization.dataWithJSONObject(arg,
options: NSJSONWritingOptions(rawValue: 0)) options: NSJSONWritingOptions(rawValue: 0))
} catch { let jsonString = NSString(data: jsonSend, encoding: NSUTF8StringEncoding)
jsonSend = nil
}
let jsonString = NSString(data: jsonSend!, encoding: NSUTF8StringEncoding)
message += jsonString! as String + "," message += jsonString! as String + ","
} catch {
print("Error creating JSON object in SocketPacket.completeMessage")
}
} else if var str = arg as? String { } else if var str = arg as? String {
str = str["\n"] ~= "\\\\n" str = str["\n"] ~= "\\\\n"
str = str["\r"] ~= "\\\\r" str = str["\r"] ~= "\\\\r"
@ -236,8 +235,12 @@ struct SocketPacket {
if data.count == 0 { if data.count == 0 {
return nil return nil
} else { } else {
arr.removeAtIndex(0) if type == PacketType.EVENT || type == PacketType.BINARY_EVENT {
return arr arr.removeAtIndex(0)
return arr
} else {
return arr
}
} }
} }
} }