handle reader errors

mozilla-mobile · Nov 14, 2024 · 9a9658c · 9a9658c
1 parent a42408f
commit 9a9658c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/firefox-ios/Storage/Rust/RustPlaces.swift b/firefox-ios/Storage/Rust/RustPlaces.swift
@@ -139,7 +139,6 @@ public class RustPlaces: BookmarksHandler, HistoryMetadataObserver {
         return deferred
     }
 
-    @discardableResult
     private func withReader<T>(
         _ callback: @escaping(_ connection: PlacesReadConnection) throws -> T
     ) -> Deferred<Maybe<T>> {
@@ -203,11 +202,14 @@ public class RustPlaces: BookmarksHandler, HistoryMetadataObserver {
     }
 
     public func countBookmarksInTrees(folderGuids: [GUID], completion: @escaping (Result<Int, Error>) -> Void) {
-        withReader { connection in
-            do {
-                let count = try connection.countBookmarksInTrees(folderGuids: folderGuids)
+        let deferredResponse = withReader { connection in
+            return try connection.countBookmarksInTrees(folderGuids: folderGuids)
+        }
+
+        deferredResponse.upon { result in
+            if let count = result.successValue {
                 completion(.success(count))
-            } catch {
+            } else if let error = result.failureValue {
                 completion(.failure(error))
             }
         }