aboutsummaryrefslogtreecommitdiff
path: root/Hotline/Utility/DataExtensions.swift
diff options
context:
space:
mode:
Diffstat (limited to 'Hotline/Utility/DataExtensions.swift')
-rw-r--r--Hotline/Utility/DataExtensions.swift11
1 files changed, 9 insertions, 2 deletions
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
}