diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift index 04a7a03ca4dbf..9f91f6b4f40e2 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift +++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift @@ -48,7 +48,7 @@ import OSLog // This does lead to long load times when a file provider domain is initially configured. // We can instead do a fast enumeration where we only scan folders as the user navigates through // them, thereby avoiding this issue; the trade-off is that we will be unable to detect - // materialised file moves to unexplored folders, therefore deleting the item when we could have + // materialized file moves to unexplored folders, therefore deleting the item when we could have // just moved it instead. // // Since it's not desirable to cancel a long recursive enumeration half-way through, we do the @@ -500,7 +500,7 @@ import OSLog } let materialisedEnumerator = fpManager.enumeratorForMaterializedItems() - let materialisedObserver = MaterialisedEnumerationObserver(ncKitAccount: ncAccount.ncKitAccount, dbManager: dbManager, log: log) { _, _ in + let materialisedObserver = MaterializedEnumerationObserver(account: ncAccount, dbManager: dbManager, log: log) { _, _ in completionHandler() } let startingPage = NSFileProviderPage(NSFileProviderPage.initialPageSortedByName as Data) diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/FPUIExtensionServiceSource.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/FPUIExtensionServiceSource.swift index 2aebdf7737915..8ef39443f0af1 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/FPUIExtensionServiceSource.swift +++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/FPUIExtensionServiceSource.swift @@ -90,7 +90,7 @@ class FPUIExtensionServiceSource: NSObject, NSFileProviderServiceSource, NSXPCLi logger.error("Could not get db manager for \(account)") return nil } - guard let item = dbManager.itemMetadataFromFileProviderItemIdentifier(identifier) else { + guard let item = dbManager.itemMetadata(identifier) else { logger.error("No item \(rawIdentifier) in db, no shares.") return nil } diff --git a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj index 670ba1a0347a8..ef5f5de80fe78 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj +++ b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj @@ -225,7 +225,7 @@ /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ - AAD7F6032EAA11670071D385 /* gui */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); name = gui; path = /Users/iva/Projekte/nextcloud/desktop/src/gui; sourceTree = ""; }; + AAFDB1862ECB63AD00C26AE7 /* src */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); name = src; path = /Users/iva/Projekte/nextcloud/desktop/src; sourceTree = ""; }; /* End PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFrameworksBuildPhase section */ @@ -407,7 +407,7 @@ C2B573941B1CD88000303B36 = { isa = PBXGroup; children = ( - AAD7F6032EAA11670071D385 /* gui */, + AAFDB1862ECB63AD00C26AE7 /* src */, AA27A4E32E93C0D700665051 /* README.md */, C2B573B31B1CD91E00303B36 /* desktopclient */, AA0A6B1C2E8EA948007F4A7A /* NextcloudDev */, diff --git a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 35b192680f4b6..76d1b3474197f 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/nextcloud/NextcloudFileProviderKit.git", "state" : { - "revision" : "863cefb02ebd88286d9b46f082dfe0a88fb774d2", - "version" : "3.2.10" + "revision" : "3ff19ffdda3361ec3446266aa757653a8b272898", + "version" : "3.2.11" } }, { diff --git a/src/gui/macOS/fileprovideritemmetadata_mac.mm b/src/gui/macOS/fileprovideritemmetadata_mac.mm index 7826693bf3e57..aa2e80432761c 100644 --- a/src/gui/macOS/fileprovideritemmetadata_mac.mm +++ b/src/gui/macOS/fileprovideritemmetadata_mac.mm @@ -90,7 +90,7 @@ QString nsNameComponentsToLocalisedQString(NSPersonNameComponents *const nameCom if (metadata._documentSize == 0) { // If the document size is 0, we can try to get the size of the file - // directly from its path. These are all materialised files anyway + // directly from its path. These are all materialized files anyway // so the size will be properly represented const auto path = metadata.userVisiblePath(); const auto fileInfo = QFileInfo(path);