mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8872 from nextcloud/fix/token-locks

Browse Source 
Fix Token Locks
This commit is contained in:
Jyrki Gadinger 2025-10-13 10:55:25 +02:00 committed by GitHub
commit 32e66991ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift
View File

@ -313,18 +313,17 @@ import OSLog
insertSyncAction(actionId)
let identifier = item.itemIdentifier
let ocId = identifier.rawValue
logger.debug("Received request to modify item.", [.item: item])
guard let ncAccount else {
logger.error("Not modifying item: \(ocId) as account not set up yet.")
logger.error("Not modifying item because account not set up yet.", [.item: identifier])
insertErrorAction(actionId)
completionHandler(item, [], false, NSFileProviderError(.notAuthenticated))
return Progress()
}
guard let ignoredFiles else {
logger.error("Not modifying item: \(ocId) as ignore list not set up yet.")
logger.error("Not modifying item because ignore list not set up yet.", [.item: identifier])
insertErrorAction(actionId)
completionHandler(item, [], false, NSFileProviderError(.notAuthenticated))
return Progress()
@ -332,13 +331,14 @@ import OSLog
guard let dbManager else {
logger.error("Not modifying item because database is unavailable.")
logger.error("Not modifying item because the database is unavailable.")
insertErrorAction(actionId)
completionHandler(item, [], false, NSFileProviderError(.cannotSynchronize))
return Progress()
}
let progress = Progress()
Task {
guard let existingItem = await Item.storedItem(
identifier: identifier,
@ -347,16 +347,19 @@ import OSLog
dbManager: dbManager,
log: log
) else {
logger.error("Not modifying item: \(ocId) as item not found.")
logger.error("Not modifying item because it was not found.", [.item: identifier])
insertErrorAction(actionId)
completionHandler(
item,
[],
false,
NSError.fileProviderErrorForNonExistentItem(withIdentifier: item.itemIdentifier)
)
return
}
let (modifiedItem, error) = await existingItem.modify(
itemTarget: item,
baseVersion: baseVersion,
@ -380,6 +383,7 @@ import OSLog
logger.debug("Calling item modification completion handler.", [.item: item.itemIdentifier, .name: item.filename, .error: error])
completionHandler(modifiedItem ?? item, [], false, error)
}
return progress
}
@ -387,13 +391,13 @@ import OSLog
identifier: NSFileProviderItemIdentifier,
baseVersion _: NSFileProviderItemVersion,
options _: NSFileProviderDeleteItemOptions = [],
request _: NSFileProviderRequest,
request: NSFileProviderRequest,
completionHandler: @escaping (Error?) -> Void
) -> Progress {
let actionId = UUID()
insertSyncAction(actionId)
logger.debug("Received request to delete item.", [.item: identifier])
logger.debug("Received request (isFileViewerRequest: \(request.isFileViewerRequest), isSystemRequest: \(request.isSystemRequest), requestingExecutable: \(request.requestingExecutable?.absoluteString ?? "nil")) to delete item.", [.item: identifier])
guard let ncAccount else {
logger.error("Not deleting item \(identifier.rawValue), account not set up yet")

6
shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -25,7 +25,7 @@
"location" : "https://github.com/nextcloud/NextcloudFileProviderKit.git",
"state" : {
"branch" : "main",
"revision" : "ed5deb764451888723ec3412dc3f7bf272d2c4a2"
"revision" : "3c28f9cec778deec04632931d1a75eb15c8c68b2"
}
},
{
@ -33,8 +33,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/nextcloud/NextcloudKit",
"state" : {
"revision" : "96c2b0e6a8bbf84c69412128f703812aec5982de",
"version" : "7.1.5"
"revision" : "a68dfcda9c0fb7874c0e9c9213d15c874f087fd2",
"version" : "7.1.6"
}
},
{