Skip to content

List only locally deleted Items in Trash - #9320

Merged
i2h3 merged 1 commit into
stable-4.0from
i2h3/fix/stable-4.0-trash
Jan 15, 2026
Merged

List only locally deleted Items in Trash#9320
i2h3 merged 1 commit into
stable-4.0from
i2h3/fix/stable-4.0-trash

Conversation

@i2h3

@i2h3 i2h3 commented Jan 15, 2026

Copy link
Copy Markdown
Collaborator

This is the solution for the imminent maintenance release and will be brought to master in 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.

@i2h3 i2h3 added this to the 4.0.5 milestone Jan 15, 2026
@i2h3 i2h3 self-assigned this Jan 15, 2026
@i2h3
i2h3 requested a review from Aiiaiiio as a code owner January 15, 2026 12:39
Copilot AI review requested due to automatic review settings January 15, 2026 12:39
@i2h3 i2h3 added bug feature: 📁 file provider macOS File Provider Extension, more general also known as virtual file system. labels Jan 15, 2026
@github-project-automation github-project-automation Bot moved this to 🧭 Planning evaluation (don't pick) in 💻 Desktop Clients team Jan 15, 2026
@i2h3
i2h3 changed the base branch from master to stable-4.0 January 15, 2026 12:39

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@i2h3 i2h3 moved this from 🧭 Planning evaluation (don't pick) to 🏗️ In progress in 💻 Desktop Clients team Jan 15, 2026
@i2h3 i2h3 changed the title I2h3/fix/stable 4.0 trash List only locally deleted Items in Trash Jan 15, 2026
Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
@i2h3
i2h3 force-pushed the i2h3/fix/stable-4.0-trash branch from a295cf5 to 2c3ebb2 Compare January 15, 2026 13:06
@i2h3
i2h3 enabled auto-merge January 15, 2026 13:07
@github-actions

Copy link
Copy Markdown
Contributor

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

Digest: sha256:32f293a9327ed20d57adfaff4735c2dd35fe3e664d09d4fe24ecae0fdd59f0c2

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

Copy link
Copy Markdown

@i2h3
i2h3 disabled auto-merge January 15, 2026 15:10
@i2h3
i2h3 merged commit a77653b into stable-4.0 Jan 15, 2026
21 checks passed
@i2h3
i2h3 deleted the i2h3/fix/stable-4.0-trash branch January 15, 2026 15:10
@github-project-automation github-project-automation Bot moved this from 🏗️ In progress to ☑️ Done in 💻 Desktop Clients team Jan 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug feature: 📁 file provider macOS File Provider Extension, more general also known as virtual file system.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants