This commit is contained in:
Erik 2015-08-02 13:09:18 -04:00
parent feea80a2f9
commit f0a45e13e2

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"