From 1ca879eb8ed13f3c77d427ed4585bd9e3df5e5a6 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Sun, 21 Aug 2022 11:58:20 +0000
Subject: [PATCH] Adjust to ObjFW changes

FossilOrigin-Name: 82f79a19ab99fd7cdb6e495212a1382829f678b44e98158b85f6fa19a9c7eae4
---
 iOS/SiteStorage.swift | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/iOS/SiteStorage.swift b/iOS/SiteStorage.swift
index 4e6d8fd..bcd39a4 100644
--- a/iOS/SiteStorage.swift
+++ b/iOS/SiteStorage.swift
@@ -34,19 +34,18 @@ class SiteStorage: OFObject {
 
     override init() {
         let fileManager = OFFileManager.default
-        let userDataPath = OFSystemInfo.userDataPath!
+        let userDataURL = OFSystemInfo.userDataURL!
 
-        if !fileManager.directoryExists(atPath: userDataPath) {
-            fileManager.createDirectory(atPath: userDataPath)
+        if !fileManager.directoryExists(at: userDataURL) {
+            fileManager.createDirectory(at: userDataURL)
         }
 
-        let path = userDataPath.appendingPathComponent(
+        let URL = userDataURL.appendingPathComponent(
             OFString(utf8String: "sites.msgpack"))
 
         var storage: [String: [NSNumber: AnyObject]]? = nil
         OFException.try({
-            let decoded = (OFData(contentsOfFile: path)
-                .objectByParsingMessagePack)
+            let decoded = (OFData(contentsOf: URL).objectByParsingMessagePack)
                 as? OFDictionary<OFString, OFDictionary<OFNumber, AnyObject>>
             storage =
                 (decoded?.nsObject as? [String: [NSNumber: AnyObject]]) ?? [:]
@@ -54,17 +53,17 @@ class SiteStorage: OFObject {
             storage = [:]
         })
 
-        self.path = path
+        self.path = URL.fileSystemRepresentation!
         self.storage = storage!
         self.sites = self.storage.keys.sorted()
     }
 
     func sites(withFilter filter: String?) -> [String] {
         return storage.keys.sorted().filter({ (name) in
-            if let filter = filter {
-                return name.localizedCaseInsensitiveContains(filter)
+            if filter == nil || filter!.isEmpty {
+                return true
             }
-            return true
+            return name.localizedCaseInsensitiveContains(filter!)
         })
     }