From c0068f11c51bb587c16dfacb73629b3c6fb67fc8 Mon Sep 17 00:00:00 2001 From: Dustin Mierau Date: Wed, 6 Dec 2023 13:52:20 -0800 Subject: Further work on UI organization --- Hotline/Utility/DataExtensions.swift | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Hotline/Utility/DataExtensions.swift') diff --git a/Hotline/Utility/DataExtensions.swift b/Hotline/Utility/DataExtensions.swift index 9f4c967..aefd204 100644 --- a/Hotline/Utility/DataExtensions.swift +++ b/Hotline/Utility/DataExtensions.swift @@ -51,8 +51,15 @@ extension Data { return self.subdata(in: offset..<(offset + length)) } - func readString(at offset: Int, length: Int, encoding: String.Encoding) -> String? { - return String(data: self[offset..<(offset + length)], encoding: encoding) + func readString(at offset: Int, length: Int) -> String? { + var str: String? + + str = String(data: self[offset..<(offset + length)], encoding: .utf8) + if str == nil { + str = String(data: self[offset..<(offset + length)], encoding: .ascii) + } + + return str } -- cgit