From: Claudio Cambra Date: Fri, 19 Jul 2024 07:17:17 +0000 (+0800) Subject: Adapt to remoteInterface changes in NCFPK X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~6^2~107^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=73fde5065d202e2f5c1a357dd0255f82c614acfb;p=nextcloud-desktop.git Adapt to remoteInterface changes in NCFPK Signed-off-by: Claudio Cambra --- diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+Thumbnailing.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+Thumbnailing.swift index f0d0bbe0e..0c7632556 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+Thumbnailing.swift +++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+Thumbnailing.swift @@ -32,7 +32,7 @@ extension FileProviderExtension: NSFileProviderThumbnailing { return NextcloudFileProviderKit.fetchThumbnails( for: itemIdentifiers, requestedSize: size, - usingKit: self.ncKit, + usingRemoteInterface: self.ncKit, perThumbnailCompletionHandler: perThumbnailCompletionHandler, completionHandler: completionHandler ) diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift index 122398203..0f3552a6a 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift +++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift @@ -93,7 +93,7 @@ import OSLog request _: NSFileProviderRequest, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void ) -> Progress { - if let item = Item.storedItem(identifier: identifier, usingKit: ncKit) { + if let item = Item.storedItem(identifier: identifier, remoteInterface: ncKit) { completionHandler(item, nil) } else { completionHandler(nil, NSFileProviderError(.noSuchItem)) @@ -135,7 +135,7 @@ import OSLog return Progress() } - guard let item = Item.storedItem(identifier: itemIdentifier, usingKit: ncKit) else { + guard let item = Item.storedItem(identifier: itemIdentifier, remoteInterface: ncKit) else { Logger.fileProviderExtension.error( """ Not fetching contents for item: \(itemIdentifier.rawValue, privacy: .public) @@ -199,7 +199,7 @@ import OSLog contents: url, request: request, domain: self.domain, - ncKit: ncKit, + remoteInterface: ncKit, ncAccount: ncAccount, progress: progress ) @@ -247,7 +247,7 @@ import OSLog return Progress() } - guard let existingItem = Item.storedItem(identifier: identifier, usingKit: ncKit) else { + guard let existingItem = Item.storedItem(identifier: identifier, remoteInterface: ncKit) else { Logger.fileProviderExtension.error( "Not modifying item: \(ocId, privacy: .public) as item not found." ) @@ -295,8 +295,7 @@ import OSLog return Progress() } - - guard let item = Item.storedItem(identifier: identifier, usingKit: ncKit) else { + guard let item = Item.storedItem(identifier: identifier, remoteInterface: ncKit) else { Logger.fileProviderExtension.error( "Not deleting item \(identifier.rawValue, privacy: .public), item not found" ) @@ -329,7 +328,7 @@ import OSLog return Enumerator( enumeratedItemIdentifier: containerItemIdentifier, ncAccount: ncAccount, - ncKit: ncKit, + remoteInterface: ncKit, domain: domain, fastEnumeration: config.fastEnumerationEnabled )