List only locally deleted Items in Trash - #9320
Conversation
There was a problem hiding this comment.
Pull request overview
This pull request enables trash syncing support for the macOS File Provider extension and includes dependency updates. The PR adds support for the supportsSyncingTrash property for macOS 13.0 and later, updates Swift package dependencies to their latest versions, and applies code formatting improvements.
Changes:
- Enables trash syncing support for File Provider domains on macOS 13.0+
- Updates Alamofire from 5.10.2 to 5.11.0, NextcloudFileProviderKit from 3.2.11 to 3.2.12, and NextcloudKit from 7.2.2 to 7.2.3
- Reformats Swift code for improved readability by condensing multi-line function calls
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/gui/macOS/fileproviderdomainmanager_mac.mm | Adds macOS 13.0+ availability check to enable supportsSyncingTrash property on file provider domains |
| shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved | Updates Swift package dependencies to newer versions |
| shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift | Code formatting changes - condenses multi-line function calls to single lines |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
a295cf5 to
2c3ebb2
Compare
|
Artifact containing the AppImage: nextcloud-appimage-pr-9320.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. |
|



This is the solution for the imminent maintenance release and will be brought to
masterin a different pull request. Due to the recent integration of the NextcloudFileProviderKit package from an external into this repository, this is a bit more complicated.Reducing the trash integration to items deleted only on the local device makes it feel more natural by ruling out side effects we have a lot of complaints about. For example: When emptying the local trash on macOS, probably no-one expects to also purge everything from the trash on the Nextcloud server, including files from shared folders or even deleted by other users who might want to restore those later.