From f0a45e13e2ff34619edeaf6ac05476df6656b91c Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 2 Aug 2015 13:09:18 -0400 Subject: [PATCH 1/2] clean up --- SocketIOClientSwift/SocketPacket.swift | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift index 5adccf6..1d59940 100644 --- a/SocketIOClientSwift/SocketPacket.swift +++ b/SocketIOClientSwift/SocketPacket.swift @@ -98,16 +98,15 @@ struct SocketPacket { for arg in data { if arg is NSDictionary || arg is [AnyObject] { - let jsonSend: NSData? do { - jsonSend = try NSJSONSerialization.dataWithJSONObject(arg, + let jsonSend = try NSJSONSerialization.dataWithJSONObject(arg, options: NSJSONWritingOptions(rawValue: 0)) + let jsonString = NSString(data: jsonSend, encoding: NSUTF8StringEncoding) + + message += jsonString! as String + "," } catch { - jsonSend = nil + print("Error creating JSON object in SocketPacket.completeMessage") } - let jsonString = NSString(data: jsonSend!, encoding: NSUTF8StringEncoding) - - message += jsonString! as String + "," } else if var str = arg as? String { str = str["\n"] ~= "\\\\n" str = str["\r"] ~= "\\\\r" From 150e26aefd8cc8b5b2bbfba8311bfd9862bb1927 Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 2 Aug 2015 13:40:45 -0400 Subject: [PATCH 2/2] fix getting args for ack and binary-ack --- SocketIOClientSwift/SocketPacket.swift | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift index 1d59940..510bb92 100644 --- a/SocketIOClientSwift/SocketPacket.swift +++ b/SocketIOClientSwift/SocketPacket.swift @@ -231,12 +231,16 @@ struct SocketPacket { func getArgs() -> [AnyObject]? { var arr = data - + if data.count == 0 { return nil } else { - arr.removeAtIndex(0) - return arr + if type == PacketType.EVENT || type == PacketType.BINARY_EVENT { + arr.removeAtIndex(0) + return arr + } else { + return arr + } } } }