From 147e06c40aa69ac9ef5d251da899dddc1e02bd24 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 10 Mar 2023 18:36:01 +0100 Subject: [PATCH] Fix return of updated and deleted metadatas in database manager Signed-off-by: Claudio Cambra --- .../FileProviderExt/NextcloudFilesDatabaseManager.swift | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudFilesDatabaseManager.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudFilesDatabaseManager.swift index bc1ab1e80..a44eb873b 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudFilesDatabaseManager.swift +++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudFilesDatabaseManager.swift @@ -194,7 +194,7 @@ class NextcloudFilesDatabaseManager : NSObject { return (returningNewMetadatas, returningUpdatedMetadatas) } - func updateItemMetadatas(account: String, serverUrl: String, updatedMetadatas: [NextcloudItemMetadataTable]) -> (newMetadatas: [NextcloudItemMetadataTable]?, updatedMetadatas: [NextcloudItemMetadataTable]?, deletedMetadatas: [NextcloudItemMetadataTable]?) { + func updateItemMetadatas(account: String, serverUrl: String, updatedMetadatas: [NextcloudItemMetadataTable], completionHandler: @escaping(_ newMetadatas: [NextcloudItemMetadataTable]?, _ updatedMetadatas: [NextcloudItemMetadataTable]?, _ deletedMetadatas: [NextcloudItemMetadataTable]?) -> Void) { let database = ncDatabase() do { @@ -209,13 +209,12 @@ class NextcloudFilesDatabaseManager : NSObject { existingMetadatas: existingMetadatas, updatedMetadatas: updatedMetadatas) - return (metadatasFromUpdate.newMetadatas, metadatasFromUpdate.updatedMetadatas, deletedMetadatas) + completionHandler(metadatasFromUpdate.newMetadatas, metadatasFromUpdate.updatedMetadatas, deletedMetadatas) } } catch let error { NSLog("Could not update any metadatas, received error: %@", error.localizedDescription) + completionHandler(nil, nil, nil) } - - return (nil, nil, nil) } func setStatusForItemMetadata(_ metadata: NextcloudItemMetadataTable, status: NextcloudItemMetadataTable.Status) -> NextcloudItemMetadataTable? { -- 2.39.5