Fix: File Provider Synchronization Status #9335

i2h3 · 2026-01-20T13:12:41Z

This migrates the file provider synchronization status reporting from UNIX sockets to the XPC connection.
Agents.md of the repository was updated.
Files excluded from synchronization no longer result in a warning state in the menu bar extra.

Copilot

Pull request overview

This PR migrates file provider synchronization status reporting from UNIX sockets to XPC connections, improving the architecture of the macOS file provider extension communication. It also updates the AGENTS.md documentation with macOS-specific development guidelines and fixes an issue where excluded files would incorrectly trigger a warning state in the menu bar.

Changes:

Replaced socket-based sync status communication with XPC-based FileProviderService implementing the new AppProtocol
Removed socket-based sync status tracking code from FileProviderSocketServer and FileProviderSocketController
Updated AGENTS.md with comprehensive macOS development guidelines

Reviewed changes

Copilot reviewed 37 out of 37 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
src/gui/tray/syncstatussummary.cpp	Updated to use FileProviderService instead of FileProviderSocketServer for sync status
src/gui/owncloudgui.cpp	Updated to use FileProviderService for sync status tracking
src/gui/macOS/fileproviderservice.h	New service class implementing AppProtocol for XPC communication
src/gui/macOS/fileproviderservice.mm	Implementation of FileProviderService with Objective-C delegate
src/gui/macOS/fileproviderxpc_mac_utils.h	Updated signature to accept FileProviderService parameter
src/gui/macOS/fileproviderxpc_mac_utils.mm	Sets up bidirectional XPC connections with AppProtocol export
src/gui/macOS/fileproviderxpc_mac.mm	Passes FileProviderService to connection processing
src/gui/macOS/fileprovidersocketserver.h	Removed sync status tracking methods
src/gui/macOS/fileprovidersocketserver.cpp	Removed sync status change handling code
src/gui/macOS/fileprovidersocketcontroller.h	Removed syncStateChanged signal
src/gui/macOS/fileprovidersocketcontroller.cpp	Removed reportSyncState and FILE_PROVIDER_DOMAIN_SYNC_STATE_CHANGE handling
src/gui/macOS/fileprovider_mac.mm	Instantiates FileProviderService singleton
src/gui/macOS/fileprovider.h	Added service() accessor method
src/gui/macOS/AppProtocol.h	Symlink to AppProtocol.h defining XPC interface
src/gui/CMakeLists.txt	Added AppProtocol.h and FileProviderService files to build
shell_integration/.../project.pbxproj	Removed ClientCommunicationService.swift, added new extension files and renamed ClientInterface file
shell_integration/.../FPUIExtensionServiceSource.swift	Updated copyright header format
shell_integration/.../FPUIExtensionService.swift	Updated copyright header format
shell_integration/.../ClientCommunicationService.swift	Removed entire file (functionality moved to extensions)
shell_integration/.../AppProtocol.h	New protocol defining app-side XPC interface for status reporting
shell_integration/.../FileProviderSocketLineProcessor.swift	Updated IgnoredFilesMatcher initialization with log parameter
shell_integration/.../FileProviderExtension.swift	Added XPC properties and updated to report sync status via XPC, updated exclusion handling comment
shell_integration/.../FileProviderExtension+Thumbnailing.swift	Updated copyright header format
shell_integration/.../FileProviderExtension+NSXPCListenerDelegate.swift	New extension implementing XPC listener delegate
shell_integration/.../FileProviderExtension+NSFileProviderServicing.swift	Extracted from FileProviderExtension+ClientInterface.swift
shell_integration/.../FileProviderExtension+NSFileProviderServiceSource.swift	New extension implementing service source protocol
shell_integration/.../FileProviderExtension+CustomActions.swift	Updated copyright header format
shell_integration/.../FileProviderExtension+ClientInterface.swift	Removed (split into multiple extensions)
shell_integration/.../FileProviderExtension+ClientCommunicationProtocol.swift	New extension implementing client communication protocol
shell_integration/.../FileProviderExtension+ChangeNotificationInterface.swift	New extension implementing change notification interface
shell_integration/.../FileProviderExt-Bridging-Header.h	Added AppProtocol.h import
shell_integration/.../IgnoredFilesMatcher.swift	Added log parameter for debugging ignore patterns
shell_integration/MacOSX/FinderSyncExt.entitlements.cmake	Added DEBUG_ENTITLEMENTS placeholder
shell_integration/MacOSX/FileProviderUIExt.entitlements.cmake	Added DEBUG_ENTITLEMENTS placeholder
shell_integration/MacOSX/FileProviderExt.entitlements.cmake	Added DEBUG_ENTITLEMENTS placeholder
shell_integration/MacOSX/CMakeLists.txt	Added conditional debug entitlements based on build type
AGENTS.md	Enhanced with macOS-specific development guidelines and detailed project structure

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

...acOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+NSXPCListenerDelegate.swift

src/gui/macOS/fileproviderservice.mm

...NextcloudIntegration/FileProviderExt/FileProviderExtension+ClientCommunicationProtocol.swift

AGENTS.md

src/gui/macOS/fileproviderservice.mm

Copilot · 2026-01-21T10:22:27Z

@i2h3 I've opened a new pull request, #9348, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot · 2026-01-21T10:22:33Z

@i2h3 I've opened a new pull request, #9349, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot

Pull request overview

Copilot reviewed 41 out of 41 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift

...acOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+NSXPCListenerDelegate.swift

AGENTS.md

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift

Copilot

Pull request overview

Copilot reviewed 41 out of 41 changed files in this pull request and generated 5 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

...acOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+NSXPCListenerDelegate.swift

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift

src/gui/macOS/fileproviderxpc_mac_utils.mm

src/gui/macOS/fileproviderservice.mm

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift

- Introduced Objective-C AppProtocol for definition of requirements of the XPC service exposed by the main app. - The established XPC connections now are configured to export and recognize AppProtocol to enable bidirectional communication. - Introduced the FileProviderService class to implement AppProtocol on the app side in Objective-C++. - Outsourced ChangeNotificationInterface conformance of FileProviderExtension into dedicated source code file. Other: - Fixed get-task-allow entitlement for extensions in debug build configurations. Signed-off-by: Iva Horn <[email protected]>

…nchronization. Signed-off-by: Iva Horn <[email protected]>

Signed-off-by: Iva Horn <[email protected]>

github-actions · 2026-01-23T13:13:22Z

Artifact containing the AppImage: nextcloud-appimage-pr-9335.zip

Digest: sha256:6a0ef860f7860855e69b0fb799175436f3886fa643f3efda66d8a26229cfe65c

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

sonarqubecloud · 2026-01-23T13:43:28Z

Quality Gate failed

Failed conditions
5 New Code Smells (required ≤ 0)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

i2h3 added this to the 4.1.0 milestone Jan 20, 2026

i2h3 self-assigned this Jan 20, 2026

i2h3 added this to 💻 Desktop Clients team Jan 20, 2026

i2h3 added bug feature: 📁 file provider labels Jan 20, 2026

github-project-automation bot moved this to 🧭 Planning evaluation (don't pick) in 💻 Desktop Clients team Jan 20, 2026

i2h3 marked this pull request as ready for review January 20, 2026 13:13

i2h3 requested review from Aiiaiiio, camilasan, mgallien and nilsding as code owners January 20, 2026 13:13

Copilot AI review requested due to automatic review settings January 20, 2026 13:13

Copilot started reviewing on behalf of i2h3 January 20, 2026 13:16 View session

Copilot AI reviewed Jan 20, 2026

View reviewed changes

i2h3 force-pushed the i2h3/fix/9682755-excluded-sync-status branch from fe5d3c6 to 216757c Compare January 20, 2026 15:00

i2h3 moved this from 🧭 Planning evaluation (don't pick) to 🏗️ In progress in 💻 Desktop Clients team Jan 20, 2026

mgallien added the 3. to review label Jan 21, 2026

Copilot AI mentioned this pull request Jan 21, 2026

fix: Add thread safety to FileProviderService sync status tracking #9348

Merged

Copilot AI mentioned this pull request Jan 21, 2026

fix: thread-safe signal emission in FileProviderService XPC callback #9349

Merged

i2h3 force-pushed the i2h3/fix/9682755-excluded-sync-status branch from a409208 to 681c4a1 Compare January 21, 2026 10:35

i2h3 requested a review from Copilot January 21, 2026 10:36

Copilot started reviewing on behalf of i2h3 January 21, 2026 10:37 View session

i2h3 enabled auto-merge January 21, 2026 10:39

Copilot AI reviewed Jan 21, 2026

View reviewed changes

i2h3 force-pushed the i2h3/fix/9682755-excluded-sync-status branch 2 times, most recently from 9904dfd to 6161491 Compare January 21, 2026 13:07

i2h3 requested a review from Copilot January 21, 2026 13:08

Copilot started reviewing on behalf of i2h3 January 21, 2026 13:08 View session

Copilot AI reviewed Jan 21, 2026

View reviewed changes

Rello mentioned this pull request Jan 21, 2026

Tray status & excluded files #8903

Closed

i2h3 force-pushed the i2h3/fix/9682755-excluded-sync-status branch 2 times, most recently from 6d9d31a to 43e1dbb Compare January 23, 2026 13:04

i2h3 added 3 commits January 23, 2026 14:05

fix(file-provider): Do not report an error for files excluded from sy…

aa3776e

…nchronization. Signed-off-by: Iva Horn <[email protected]>

chore: Updated AGENTS.md

75f1351

Signed-off-by: Iva Horn <[email protected]>

i2h3 force-pushed the i2h3/fix/9682755-excluded-sync-status branch from 43e1dbb to 75f1351 Compare January 23, 2026 13:05

i2h3 disabled auto-merge January 23, 2026 13:05

Fix: File Provider Synchronization Status #9335

Are you sure you want to change the base?

Fix: File Provider Synchronization Status #9335

Conversation

i2h3 commented Jan 20, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Jan 21, 2026

Uh oh!

Copilot AI commented Jan 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 23, 2026

Uh oh!

sonarqubecloud bot commented Jan 23, 2026

Quality Gate failed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants