Tusker/Caching/ImageCache.swift

@@ -32,38 +32,46 @@ class ImageCache {
     }
     
     func get(_ url: URL, loadOriginal: Bool = false, completion: ((Data?, UIImage?) -> Void)?) -> Request? {
+        let key = url.absoluteString
+        
+        let wrappedCompletion: ((Data?, UIImage?) -> Void)?
+        if let completion = completion {
+            wrappedCompletion = { (data, image) in
+                if let image {
+                    if !loadOriginal,
+                       let size = self.desiredPixelSize {
+                        image.prepareThumbnail(of: size) {
+                            completion(data, $0)
+                        }
+                    } else {
+                        image.prepareForDisplay {
+                            completion(data, $0)
+                        }
+                    }
+                } else {
+                    completion(data, image)
+                }
+            }
+        } else {
+            wrappedCompletion = nil
+        }
+        
         if !ImageCache.disableCaching,
-           let entry = try? cache.get(url.absoluteString, loadOriginal: loadOriginal) {
+           let entry = try? cache.get(key, loadOriginal: loadOriginal) {
-            completion?(entry.data, entry.image)
+            wrappedCompletion?(entry.data, entry.image)
             return nil
         } else {
-            return Task.detached(priority: .userInitiated) {
+            let task = dataTask(url: url, completion: wrappedCompletion)
-                let result = await self.fetch(url: url)
+            task.resume()
-                switch result {
+            return task
-                case .data(let data):
-                    completion?(data, nil)
-                case .dataAndImage(let data, let image):
-                    completion?(data, image)
-                case .none:
-                    completion?(nil, nil)
-                }
-            }
         }
     }
     
     func get(_ url: URL, loadOriginal: Bool = false) async -> (Data?, UIImage?) {
-        if !ImageCache.disableCaching,
+        // todo: this should integrate with the task cancellation mechanism somehow
-           let entry = try? cache.get(url.absoluteString, loadOriginal: loadOriginal) {
+        return await withCheckedContinuation { continuation in
-            return (entry.data, entry.image)
+            _ = get(url, loadOriginal: loadOriginal) { data, image in
-        } else {
+                continuation.resume(returning: (data, image))
-            let result = await self.fetch(url: url)
-            switch result {
-            case .data(let data):
-                return (data, nil)
-            case .dataAndImage(let data, let image):
-                return (data, image)
-            case .none:
-                return (nil, nil)
             }
         }
     }
@@ -73,28 +81,21 @@ class ImageCache {
         guard !ImageCache.disableCaching else { return }
         
         if !((try? cache.has(url.absoluteString)) ?? false) {
-            Task.detached(priority: .medium) {
+            let task = dataTask(url: url, completion: nil)
-                _ = await self.fetch(url: url)
+            task.resume()
-            }
         }
     }
     
-    private func fetch(url: URL) async -> FetchResult {
+    private func dataTask(url: URL, completion: ((Data?, UIImage?) -> Void)?) -> URLSessionDataTask {
-        guard let (data, _) = try? await URLSession.shared.data(from: url) else {
+        return URLSession.shared.dataTask(with: url) { data, response, error in
-            return .none
+            guard error == nil,
+                  let data else {
+                return
             }
-        guard let image = UIImage(data: data) else {
+            let image = UIImage(data: data)
-            try? cache.set(url.absoluteString, data: data, image: nil)
+            try? self.cache.set(url.absoluteString, data: data, image: image)
-            return .data(data)
+            completion?(data, image)
         }
-        let preparedImage: UIImage?
-        if let desiredPixelSize {
-            preparedImage = await image.byPreparingThumbnail(ofSize: desiredPixelSize)
-        } else {
-            preparedImage = await image.byPreparingForDisplay()
-        }
-        try? cache.set(url.absoluteString, data: data, image: preparedImage ?? image)
-        return .dataAndImage(data, preparedImage ?? image)
     }
     
     func getData(_ url: URL) -> Data? {
@@ -113,12 +114,6 @@ class ImageCache {
         return cache.disk?.getSizeInBytes()
     }
     
-    typealias Request = Task<Void, Never>
+    typealias Request = URLSessionDataTask
-    
-    enum FetchResult {
-        case data(Data)
-        case dataAndImage(Data, UIImage)
-        case none
-    }
     
 }

Tusker/Screens/Bookmarks/BookmarksViewController.swift

@@ -219,11 +219,6 @@ class BookmarksViewController: UIViewController, CollectionViewController, Refre
     }
     
     @objc private func managedObjectsDidChange(_ notification: Foundation.Notification) {
-        // only perform local updates while the vc is idle
-        // otherwise loading the bookmarks ends up inserting them out of order
-        guard case .loaded = state else {
-            return
-        }
         var snapshot = dataSource.snapshot()
         func prepend(item: Item) {
             if let first = snapshot.itemIdentifiers.first {
@@ -242,7 +237,7 @@ class BookmarksViewController: UIViewController, CollectionViewController, Refre
         if let updated = notification.userInfo?[NSUpdatedObjectsKey] as? Set<NSManagedObject> {
             for case let status as StatusMO in updated {
                 let item = Item.status(id: status.id, state: .unknown, addedLocally: true)
-                let exists = snapshot.itemIdentifiers.contains(item)
+                var exists = snapshot.itemIdentifiers.contains(item)
                 if status.bookmarked == true && !exists {
                     prepend(item: item)
                     hasChanges = true

Tusker/Screens/Large Image/LargeImageViewController.xib

@@ -28,7 +28,7 @@
                 <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kHo-B9-R7a">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="36"/>
                 </view>
-                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JZk-BO-2Vh">
+                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" adjustsFontForContentSizeCategory="YES" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JZk-BO-2Vh">
                     <rect key="frame" x="0.0" y="517" width="375" height="150"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="displayP3"/>
                     <constraints>

Tusker/Screens/Status Action Account List/StatusActionAccountListViewController.swift

@@ -48,7 +48,6 @@ class StatusActionAccountListViewController: UIViewController {
                     indicator.centerYAnchor.constraint(equalTo: view.safeAreaLayoutGuide.centerYAnchor),
                 ])
             case .displaying(let vc):
-                vc.view.translatesAutoresizingMaskIntoConstraints = false
                 embedChild(vc)
             case .notFound:
                 showStatusNotFound()