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

Don't use NSDictionary

Browse Source
This commit is contained in:
Erik Little 2017-09-17 11:31:24 -04:00
parent c20c286864
commit 1faa4b925c
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/SocketIO/Engine/SocketEngine.swift
View File

@ -216,7 +216,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
private func checkAndHandleEngineError(_ msg: String) { private func checkAndHandleEngineError(_ msg: String) {
do { do {
let dict = try msg.toNSDictionary() let dict = try msg.toDictionary()
guard let error = dict["message"] as? String else { return } guard let error = dict["message"] as? String else { return }
/* /*
@ -419,7 +419,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
} }
private func handleOpen(openData: String) { 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") didError(reason: "Error parsing open packet")
return return

4
Source/SocketIO/Util/SocketExtensions.swift
View File

@ -114,9 +114,9 @@ extension String {
return array return array
} }
func toNSDictionary() throws -> NSDictionary { func toDictionary() throws -> [String: Any] {
guard let binData = data(using: .utf16, allowLossyConversion: false) else { return [:] } 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 throw JSONError.notNSDictionary
} }