diff options
| -rw-r--r-- | Hotline/Hotline/HotlineExtensions.swift | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/Hotline/Hotline/HotlineExtensions.swift b/Hotline/Hotline/HotlineExtensions.swift index 44a3c38..dcfe14b 100644 --- a/Hotline/Hotline/HotlineExtensions.swift +++ b/Hotline/Hotline/HotlineExtensions.swift @@ -741,30 +741,7 @@ extension Array where Element == UInt8 { return "" } - let allowedEncodings = [ - NSUTF8StringEncoding, - NSShiftJISStringEncoding, - NSUnicodeStringEncoding, - NSWindowsCP1251StringEncoding, - ] - - var decodedNSString: NSString? - let rawValue = NSString.stringEncoding( - for: subdata, encodingOptions: [.allowLossyKey: false], convertedString: &decodedNSString, - usedLossyConversion: nil) - - if allowedEncodings.contains(rawValue) { - return decodedNSString as? String - } else if rawValue > 1 { - print("ENCODING FOUND \(rawValue)") - } - - var macStr = String(data: subdata, encoding: .macOSRoman) - if macStr == nil { - macStr = String(data: subdata, encoding: .nonLossyASCII) - } - - return macStr + return String(data: subdata, encoding: .macOSRoman) } func readPString(at offset: Int) -> (String?, Int) { |