File Provider Trash Changes #9323
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
i2h3
added
bug
os: 🍎 macOS
feature: ☁️ GUI
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
i2h3
requested review from
Aiiaiiio,
camilasan,
mgallien and
nilsding
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
This PR removes the trash deletion configuration feature for the macOS File Provider, transitioning to always allowing trash operations on the server side. The change simplifies the implementation by enabling supportsSyncingTrash at the domain level and removing user-facing controls for trash deletion.
Changes:
- Removed UI controls and backend logic for the "Allow deletion of items in Trash" setting
- Enabled server-side trash syncing support for macOS 13+ by setting
supportsSyncingTrash = YES - Simplified trash enumeration to only show locally deleted items (not remote trash items)
Reviewed changes
Copilot reviewed 19 out of 19 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| translations/client_en.ts | Removed translation entries for the deprecated trash deletion setting UI |
| translations/client_de.ts | Removed German translation for "General settings" label |
| src/gui/macOS/ui/FileProviderSettings.qml | Removed UI checkbox for trash deletion setting and "General settings" section |
| src/gui/macOS/fileproviderxpc_mac.mm | Removed XPC methods for querying and setting trash deletion state |
| src/gui/macOS/fileproviderxpc.h | Removed method declarations for trash deletion state management |
| src/gui/macOS/fileprovidersettingscontroller_mac.mm | Removed controller methods for managing trash deletion preferences |
| src/gui/macOS/fileprovidersettingscontroller.h | Removed Q_INVOKABLE methods and signals for trash deletion |
| src/gui/macOS/fileproviderdomainmanager.mm | Added supportsSyncingTrash = YES for macOS 13+ to enable server-side trash |
| shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationService.swift | Removed XPC service methods for trash deletion setting |
| shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationProtocol.h | Removed protocol methods for trash deletion |
| shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift | Removed guard clause that blocked deletion of trashed items based on configuration |
| shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderDomainDefaults.swift | Marked trashDeletionEnabled config key as obsolete and removed getter/setter |
| shell_integration/MacOSX/NextcloudFileProviderKit/Tests/NextcloudFileProviderKitTests/RemoteChangeObserverTests.swift | Added delay before test execution and reformatted assertion statements |
| shell_integration/MacOSX/NextcloudFileProviderKit/Tests/NextcloudFileProviderKitTests/EnumeratorTests.swift | Updated trash enumeration tests to expect empty results and no newly added items |
| shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Trash.swift | Improved logging with structured messages and added whitespace for readability |
| shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Modify.swift | Reformatted code and added duplicate guard statement (bug) |
| shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Enumeration/Enumerator.swift | Changed trash enumeration to return empty set instead of fetching remote trash items |
| shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Enumeration/Enumerator+Trash.swift | Simplified trash change enumeration to only detect remote permanent deletions |
| shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager.swift | Fixed log messages to use fileName instead of non-existent name property |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
...tion/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Modify.swift
Outdated
Show resolved
Hide resolved
...NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Enumeration/Enumerator+Trash.swift
Outdated
Show resolved
Hide resolved
i2h3
force-pushed
the
i2h3/fix/trash
branch
2 times, most recently
from
f889e19 to
e0c1776
Compare
6 tasks
mgallien
approved these changes
Jan 21, 2026
Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
mgallien
force-pushed
the
i2h3/fix/trash
branch
from
2f90317 to
a534f13
Compare
|
Artifact containing the AppImage: nextcloud-appimage-pr-9323.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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a port of the recent changes for 4.0.5 to the
masterbranch. They could not be cherry picked due to the intermittent migration of NextcloudFileProviderKit into this repository.See the individual commits for the separate changes!