Skip to content

Backport/141/stable 3.0#142

Merged
camilasan merged 5 commits into
mainfrom
backport/141/stable-3.0
Jul 8, 2026
Merged

Backport/141/stable 3.0#142
camilasan merged 5 commits into
mainfrom
backport/141/stable-3.0

Conversation

@camilasan

Copy link
Copy Markdown
Member

🤖 AI (if applicable)

  • The content of this PR was partly or fully generated using AI

i2h3 and others added 5 commits January 15, 2026 13:30
- Introduced new schema property wasTrashedLocally on SendableItemMetadata.
- Added corresponding schema version and migration.
- Extended related data models accordingly.
- Updated Enumerator to no longer enumerate remote trash items based on wasTrashedLocally.

Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
To stay compatible with the existing tool chain in our CI. The requirement of 6.2 is not necessary as of now.

Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
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>
@camilasan camilasan requested a review from i2h3 July 8, 2026 07:19
@camilasan camilasan merged commit 8360eea into main Jul 8, 2026
4 of 5 checks passed
@camilasan camilasan deleted the backport/141/stable-3.0 branch July 8, 2026 07:33
@camilasan camilasan restored the backport/141/stable-3.0 branch July 8, 2026 07:56
@camilasan camilasan deleted the backport/141/stable-3.0 branch July 8, 2026 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants