Fix cache read preventing the download from happening

Author: kean

WordPress/Classes/Services/BlockEditorCache.swift

@@ -24,14 +24,12 @@ final actor BlockEditorCache {
         try settings.write(to: fileURL)
     }
 
-    func getBlockSettings(for blogID: String) throws -> Data? {
+    func getBlockSettings(for blogID: String) -> Data? {
         let fileURL = makeBlockSettingsURL(for: blogID)
-
         guard FileManager.default.fileExists(atPath: fileURL.path) else {
             return nil
         }
-
-        return try Data(contentsOf: fileURL)
+        return try? Data(contentsOf: fileURL)
     }
 
     func deleteBlockSettings(for blogID: String) throws {

WordPress/Classes/Services/RawBlockEditorSettingsService.swift

@@ -31,7 +31,7 @@ final class RawBlockEditorSettingsService {
     /// the network.
     func getSettings(allowingCachedResponse: Bool = true) async throws -> Data {
         // Return cached settings if available
-        if allowingCachedResponse, let cachedSettings = try await BlockEditorCache.shared.getBlockSettings(for: blogID) {
+        if allowingCachedResponse, let cachedSettings = await BlockEditorCache.shared.getBlockSettings(for: blogID) {
             return cachedSettings
         }
         return try await fetchSettingsFromAPI()

WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift

@@ -181,10 +181,7 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
 //            DDLogError("Error syncing JETPACK: \(String(describing: error))")
 //        })
 
-        editorLoadingTask = Task { @MainActor in
-            await loadEditor()
-        }
-
+        loadEditor()
         onViewDidLoad()
     }
 
@@ -212,7 +209,7 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
         setContentScrollView(editorViewController.webView.scrollView)
     }
 
-    // MARK: - Functions
+    // MARK: - Helpers
 
     private func configureNavigationBar() {
         navigationController?.navigationBar.accessibilityIdentifier = "Gutenberg Editor Navigation Bar"
@@ -277,29 +274,6 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
         }
     }
 
-    @MainActor
-    private func loadEditor() async {
-        showActivityIndicator()
-
-        do {
-            let dependencies = try await fetchEditorDependencies()
-
-            let configuration = editorViewController.configuration.toBuilder()
-                .apply(dependencies.settings) { $0.setEditorSettings($1) }
-                .setTitle(post.postTitle ?? "")
-                .setContent(post.content ?? "")
-                .build()
-
-            editorViewController.updateConfiguration(configuration)
-            editorViewController.startEditorSetup()
-
-            // Handles refreshing controls with state context after options screen is dismissed
-            editorContentWasUpdated()
-        } catch {
-            // TODO: handle errors
-        }
-    }
-
     // MARK: - Keyboard Observers
 
     private func setupKeyboardObservers() {
@@ -367,6 +341,45 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
     }
 
     // MARK: - Editor Setup
+
+    private func loadEditor() {
+        editorLoadingTask = Task { @MainActor in
+            await actuallyLoadEditor()
+        }
+    }
+
+    @MainActor
+    private func actuallyLoadEditor() async {
+        showActivityIndicator()
+
+        do {
+            let dependencies = try await fetchEditorDependencies()
+            startEditor(dependencies: dependencies)
+        } catch {
+            hideActivityIndicator()
+
+            let host = UIHostingView(view: EmptyStateView.failure(error: error) { [weak self] in
+                self?.loadEditor()
+            })
+            view.addSubview(host)
+            host.pinEdges()
+        }
+    }
+
+    private func startEditor(dependencies: EditorDependencies) {
+        let configuration = editorViewController.configuration.toBuilder()
+            .apply(dependencies.settings) { $0.setEditorSettings($1) }
+            .setTitle(post.postTitle ?? "")
+            .setContent(post.content ?? "")
+            .build()
+
+        editorViewController.updateConfiguration(configuration)
+        editorViewController.startEditorSetup()
+
+        // Handles refreshing controls with state context after options screen is dismissed
+        editorContentWasUpdated()
+    }
+
     private func fetchEditorDependencies() async throws -> EditorDependencies {
         let settings: String?
         do {
@@ -421,7 +434,7 @@ extension NewGutenbergViewController: GutenbergKit.EditorViewControllerDelegate
             // is still reflecting the actual startup time of the editor
             editorSession.start()
         }
-        self.hideActivityIndicator()
+        hideActivityIndicator()
     }
 
     func editor(_ viewContoller: GutenbergKit.EditorViewController, didDisplayInitialContent content: String) {