From 68044891f02618aadf4bdf494adc93bb4c7f47ab Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 14 Mar 2023 16:06:20 +0100
Subject: [PATCH] Properly respond to errors in working set enumerateItems in
 FileProviderEnumerator

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 .../FileProviderExt/FileProviderEnumerator.swift    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
index c7ef8d7b6..22b096ada 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
@@ -93,6 +93,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
                 let directoryMetadatas = dbManager.directoryMetadatas(account: ncAccount.ncKitAccount)
                 var allMetadatas: [NextcloudItemMetadataTable] = []
 
+                var serverError: NKError?
                 let dispatchGroup = DispatchGroup()  // TODO: Maybe own thread?
 
                 for directoryMetadata in directoryMetadatas {
@@ -106,6 +107,13 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
                     FileProviderEnumerator.readServerUrl(directoryMetadata.serverUrl, ncAccount: ncAccount, ncKit: ncKit) { metadatas, _, _, _, readError in
                         guard readError == nil else {
                             NSLog("Finishing enumeration of working set directory %@ with error %@", directoryMetadata.serverUrl, readError!.localizedDescription)
+
+                            let nkError = NKError(error: readError!)
+                            if nkError.isUnauthenticatedError || nkError.isCouldntConnectError {
+                                // If it is a critical error then stop, if not then continue
+                                serverError = nkError
+                            }
+
                             dispatchGroup.leave()
                             return
                         }
@@ -120,6 +128,11 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
                     }
 
                     dispatchGroup.wait()
+                    
+                    guard serverError == nil else {
+                        observer.finishEnumeratingWithError(serverError!.error)
+                        return
+                    }
                 }
 
                 FileProviderEnumerator.completeEnumerationObserver(observer, ncKit: self.ncKit, numPage: 1, itemMetadatas: allMetadatas)
-- 
2.30.2