Retry getting information from FileProviderExt if doing so has failed (usually due...

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/ShareTableViewDataSource.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/ShareTableViewDataSource.swift
index 8a6565c74e70e327904fa1f63b4d4c1a346d255e..d61d38b73ce422ee0f159ec4e39b5ff40c73689f 100644 (file)
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/ShareTableViewDataSource.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/ShareTableViewDataSource.swift
@@ -13,6 +13,7 @@ import OSLog
 class ShareTableViewDataSource: NSObject, NSTableViewDataSource, NSTableViewDelegate {
     private let shareItemViewIdentifier = NSUserInterfaceItemIdentifier("ShareTableItemView")
     private let shareItemViewNib = NSNib(nibNamed: "ShareTableItemView", bundle: nil)
+    private let reattemptInterval: TimeInterval = 3.0
 
     var uiDelegate: ShareViewDataSourceUIDelegate?
     var sharesTableView: NSTableView? {
@@ -54,6 +55,14 @@ class ShareTableViewDataSource: NSObject, NSTableViewDataSource, NSTableViewDele
         }
     }
 
+    func reattempt() {
+        DispatchQueue.main.async {
+            Timer.scheduledTimer(withTimeInterval: self.reattemptInterval, repeats: false) { _ in
+                Task { await self.reload() }
+            }
+        }
+    }
+
     func reload() async {
         guard let itemURL = itemURL else { return }
         guard let itemIdentifier = await withCheckedContinuation({
@@ -76,8 +85,11 @@ class ShareTableViewDataSource: NSObject, NSTableViewDataSource, NSTableViewDele
             let connection = try await serviceConnection(url: itemURL)
             guard let serverPath = await connection.itemServerPath(identifier: itemIdentifier),
                   let credentials = await connection.credentials() as? Dictionary<String, String>,
-                  let convertedAccount = NextcloudAccount(dictionary: credentials) else {
-                presentError("Failed to get details from FileProviderExt")
+                  let convertedAccount = NextcloudAccount(dictionary: credentials),
+                  !convertedAccount.password.isEmpty
+            else {
+                presentError("Failed to get details from File Provider Extension. Retrying.")
+                reattempt()
                 return
             }
             let serverPathString = serverPath as String
@@ -98,7 +110,8 @@ class ShareTableViewDataSource: NSObject, NSTableViewDataSource, NSTableViewDele
                 itemIdentifier: itemIdentifier, itemRelativePath: serverPathString
             )
         } catch let error {
-            presentError("Could not reload data: \(error)")
+            presentError("Could not reload data: \(error), will try again.")
+            reattempt()
         }
     }