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

Fix socketio/socket.io-client-swift#203

Browse Source
This commit is contained in:
Erik 2015-10-13 12:28:02 -04:00
parent 18a227e591
commit 7ff1d327de
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SocketIOClientSwift/SocketEngine.swift
View File

@ -530,15 +530,16 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
private func parseEngineMessage(var message: String, fromPolling: Bool) { private func parseEngineMessage(var message: String, fromPolling: Bool) {
Logger.log("Got message: %@", type: logType, args: message) Logger.log("Got message: %@", type: logType, args: message)
if fromPolling {
fixDoubleUTF8(&message)
}
let type = PacketType(str: (message["^(\\d)"].groups()?[1]) ?? "") ?? { let type = PacketType(str: (message["^(\\d)"].groups()?[1]) ?? "") ?? {
self.checkIfMessageIsBase64Binary(message) self.checkIfMessageIsBase64Binary(message)
return .Noop return .Noop
}() }()
if fromPolling && type != .Noop {
fixDoubleUTF8(&message)
}
switch type { switch type {
case PacketType.Message: case PacketType.Message:
message.removeAtIndex(message.startIndex) message.removeAtIndex(message.startIndex)

1
SocketIOClientSwift/SocketFixUTF8.swift
View File

@ -26,6 +26,7 @@
import Foundation import Foundation
func fixDoubleUTF8(inout name: String) { func fixDoubleUTF8(inout name: String) {
print(name)
let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding)! let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding)!
let latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding)! let latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding)!
name = latin1 as String name = latin1 as String