From 02d82adf07e07606405dcf4b0422e147c6cc6b4a Mon Sep 17 00:00:00 2001 From: Erik Little Date: Sun, 17 Sep 2017 11:31:24 -0400 Subject: [PATCH] Don't use NSDictionary --- Source/SocketIO/Engine/SocketEngine.swift | 4 ++-- Source/SocketIO/Util/SocketExtensions.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/SocketIO/Engine/SocketEngine.swift b/Source/SocketIO/Engine/SocketEngine.swift index 9995cb9..2fe64a3 100644 --- a/Source/SocketIO/Engine/SocketEngine.swift +++ b/Source/SocketIO/Engine/SocketEngine.swift @@ -206,7 +206,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll private func checkAndHandleEngineError(_ msg: String) { do { - let dict = try msg.toNSDictionary() + let dict = try msg.toDictionary() guard let error = dict["message"] as? String else { return } /* @@ -435,7 +435,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll } private func handleOpen(openData: String) { - guard let json = try? openData.toNSDictionary() else { + guard let json = try? openData.toDictionary() else { didError(reason: "Error parsing open packet") return diff --git a/Source/SocketIO/Util/SocketExtensions.swift b/Source/SocketIO/Util/SocketExtensions.swift index ef422c3..3959f6d 100644 --- a/Source/SocketIO/Util/SocketExtensions.swift +++ b/Source/SocketIO/Util/SocketExtensions.swift @@ -111,9 +111,9 @@ extension String { return array } - func toNSDictionary() throws -> NSDictionary { + func toDictionary() throws -> [String: Any] { guard let binData = data(using: .utf16, allowLossyConversion: false) else { return [:] } - guard let json = try JSONSerialization.jsonObject(with: binData, options: .allowFragments) as? NSDictionary else { + guard let json = try JSONSerialization.jsonObject(with: binData, options: .allowFragments) as? [String: Any] else { throw JSONError.notNSDictionary }