Skip to content

Commit 57ea5fb

Browse files
committed
fix(file-provider): Do not report an error for files excluded from synchronization.
Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
1 parent b7a1904 commit 57ea5fb

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

‎shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,11 @@ import OSLog
296296
if error == nil {
297297
removeSyncAction(actionId)
298298
} else {
299-
// Do not consider the exclusion of a lock file a synchronization error resulting in a misleading status report because exclusion is expected.
299+
// Do not consider the exclusion of a file a synchronization error resulting in a misleading status report because exclusion is expected.
300300
// Though, the exclusion error code is only available starting with macOS 13, hence this logic reads a bit more cumbersome.
301301

302302
if #available(macOS 13.0, *) {
303-
if isLockFileName(itemTemplate.filename), let fileProviderError = error as? NSFileProviderError, fileProviderError.code == .excludedFromSync {
303+
if let fileProviderError = error as? NSFileProviderError, fileProviderError.code == .excludedFromSync {
304304
removeSyncAction(actionId)
305305
} else {
306306
insertErrorAction(actionId)
@@ -727,7 +727,6 @@ import OSLog
727727

728728
logger.debug("Reporting synchronization state.", [.name: argument])
729729

730-
let message = command + ":" + argument + "\n"
731-
app?.reportSyncStatus(message)
730+
app?.reportSyncStatus(argument, forDomainIdentifier: domain.identifier.rawValue)
732731
}
733732
}

0 commit comments

Comments
 (0)