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

View File

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

View File

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

View File

@ -116,7 +116,7 @@ struct SocketPacket {
message += jsonString! as String + ","
} catch {
Logger.error("Error creating JSON object in SocketPacket.completeMessage", type: SocketPacket.logType)
Logger.error("Error creating JSON object in SocketPacket.completeMessage", type: SocketPacket.logType)
}
} else if var str = arg as? String {
str = str["\n"] ~= "\\\\n"