fix(file-provider): Sync state for excluded lock files. #9173
Conversation
i2h3
commented
Dec 3, 2025
i2h3
commented
- Added debug logging to file provider extension about its sync actions.
- Added debug logging to file provider extension about its sync state reported to the main app through the socket.
- Added debug logging to the main app about the sync state received from a file provider extension through the socket.
- Updated sync action management to not consider the exclusion of a lock file as an error.
i2h3
requested review from
Aiiaiiio,
camilasan,
mgallien and
nilsding
as code owners
github-project-automation
bot
moved this to 🧭 Planning evaluation (don't pick)
in 💻 Desktop Clients team
i2h3
moved this from 🧭 Planning evaluation (don't pick)
to 🏗️ In progress
in 💻 Desktop Clients team
|
/backport to stable-4.0 |
There was a problem hiding this comment.
Pull request overview
This PR enhances the file provider extension's observability and fixes a sync state reporting issue related to lock files. The changes add debug logging throughout the sync action lifecycle and implement special handling for lock file exclusion errors to prevent misleading sync status reports.
Key Changes:
- Added comprehensive debug logging for sync action state transitions (insert, remove, error) and sync state reporting
- Implemented macOS 13.0+ conditional logic to distinguish lock file exclusion from actual synchronization errors
- Improved error handling with defensive nil checks in sync state reporting
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/gui/macOS/fileprovidersocketcontroller.cpp | Added debug logging when receiving sync state changes from file provider extension |
| shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift | Added debug logging for sync action lifecycle methods; implemented special handling for lock file exclusion errors to avoid reporting them as sync failures |
| shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+ClientInterface.swift | Enhanced sync state reporting with additional debug logging and improved error handling with explicit nil checks |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Added debug logging to file provider extension about its sync actions. - Added debug logging to file provider extension about its sync state reported to the main app through the socket. - Added debug logging to the main app about the sync state received from a file provider extension through the socket. - Updated sync action management to not consider the exclusion of a lock file as an error. Signed-off-by: Iva Horn <[email protected]>
mgallien
force-pushed
the
i2h3/fix/9682755-status-reporting-2
branch
from
73abde9 to
e8bd02e
Compare
|
Artifact containing the AppImage: nextcloud-appimage-pr-9173.zip Digest: 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. |
|
github-project-automation
bot
moved this from 🏗️ In progress
to ☑️ Done
in 💻 Desktop Clients team
