Skip to content

[stable-33.0] fix(file-provider): detect lock changes during working set enumeration.#10026

Merged
camilasan merged 2 commits into
stable-33.0from
backport/10002/stable-33.0
May 13, 2026
Merged

[stable-33.0] fix(file-provider): detect lock changes during working set enumeration.#10026
camilasan merged 2 commits into
stable-33.0from
backport/10002/stable-33.0

Conversation

@backportbot

@backportbot backportbot Bot commented May 13, 2026

Copy link
Copy Markdown

Backport of PR #10002

camilasan added 2 commits May 13, 2026 14:09
Nextcloud file locking does not update etags, so the previous
optimisation that skipped child directories with unchanged etags
silently hid lock state changes on nested files. Only skip directories
that are both unchanged and have no materialised descendants.

Also preserve lockToken and visitedDirectory in the target depth read
path, matching the other two code paths.

Signed-off-by: Camila Ayres <hello@camilasan.com>
Add simple unit test for isInSameDatabaseStoreableRemoteState. Use unique identifiers in
lockToken test. Set creationDate in toNKFile() to match toItemMetadata().

Signed-off-by: Camila Ayres <hello@camilasan.com>
@backportbot backportbot Bot requested a review from i2h3 May 13, 2026 14:09
@backportbot backportbot Bot requested a review from nilsding as a code owner May 13, 2026 14:09
@backportbot backportbot Bot added bug os: 🍎 macOS Apple macOS, formerly also known as OS X 3. to review feature: locking labels May 13, 2026
@backportbot backportbot Bot added this to the 33.0.5 milestone May 13, 2026
@github-actions

Copy link
Copy Markdown
Contributor

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

Digest: sha256:cddd7b50e6b73dbdf5f31c6f468e0d3d1aa44039b8131f3563f5cc3076e3d59a

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

@camilasan camilasan merged commit d32709d into stable-33.0 May 13, 2026
21 checks passed
@camilasan camilasan deleted the backport/10002/stable-33.0 branch May 13, 2026 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review bug feature: locking os: 🍎 macOS Apple macOS, formerly also known as OS X

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant