Backport/141/stable 3.0#143
Merged
Merged
Conversation
Items with pending uploads and local origin lock files are protected from deletion in the recursive directory delete path, so a moved or renamed parent no longer wipes unsynced children. Pending upload items are also skipped in the enumerator deletion pass, and reported changes are sorted so parents come before children to avoid duplicate folders on rename. Backport of nextcloud/desktop#10134, adapted to the enumerator architecture of the 3.2.x line. The 404 child deferral and move reconciliation logic from master do not apply here. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Camila Ayres <hello@camilasan.com>
NextcloudKit 7.3.x changed several signatures: upload and download now report a raw response, uploadChunk was replaced by uploadChunkAsync, and NKFile.tags became [NKTag]. Parse the metadata callers expect from the response headers, provide a conforming downloadAsync wrapper, and switch chunked upload to uploadChunkAsync, keeping the RemoteInterface protocol and all call sites unchanged. This makes the 3.2.x line build against NextcloudKit 7.3.x, which CI resolves. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Camila Ayres <hello@camilasan.com>
NextcloudCapabilitiesKit 2.5.x requires ocs.data.version, so the inline capability JSONs without it made Capabilities(data:) return nil and the force unwrap in capabilitiesFromMockJSON crashed the test run. Add a minimal version block to each mock. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Camila Ayres <hello@camilasan.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
🤖 AI (if applicable)