Skip to content

Commit ee63c4e

Browse files
committed
refactor out checking for base64
1 parent fcfb409 commit ee63c4e

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

Source/SocketEngine.swift

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,12 @@ public final class SocketEngine : NSObject, NSURLSessionDelegate, SocketEnginePo
153153
}
154154
}
155155

156-
private func checkIfMessageIsBase64Binary(message: String) -> Bool {
157-
if message.hasPrefix("b4") {
158-
// binary in base64 string
159-
let noPrefix = message[message.startIndex.advancedBy(2)..<message.endIndex]
160-
161-
if let data = NSData(base64EncodedString: noPrefix, options: .IgnoreUnknownCharacters) {
162-
client?.parseEngineBinaryData(data)
163-
}
164-
165-
return true
166-
} else {
167-
return false
156+
private func handleBase64(message: String) {
157+
// binary in base64 string
158+
let noPrefix = message[message.startIndex.advancedBy(2)..<message.endIndex]
159+
160+
if let data = NSData(base64EncodedString: noPrefix, options: .IgnoreUnknownCharacters) {
161+
client?.parseEngineBinaryData(data)
168162
}
169163
}
170164

@@ -419,11 +413,13 @@ public final class SocketEngine : NSObject, NSURLSessionDelegate, SocketEnginePo
419413

420414
let reader = SocketStringReader(message: message)
421415
let fixedString: String
416+
417+
if message.hasPrefix("b4") {
418+
return handleBase64(message)
419+
}
422420

423421
guard let type = SocketEnginePacketType(rawValue: Int(reader.currentCharacter) ?? -1) else {
424-
if !checkIfMessageIsBase64Binary(message) {
425-
checkAndHandleEngineError(message)
426-
}
422+
checkAndHandleEngineError(message)
427423

428424
return
429425
}

0 commit comments

Comments
 (0)