Skip to content

[stable35] fix: only use unencrypted_size if set to a value - #65115

Merged
AndyScherzinger merged 2 commits into
stable35from
backport/64963/stable35
Oct 5, 2026
Merged

AndyScherzinger merged 2 commits into
stable35from
backport/64963/stable35

Conversation

@backportbot

@backportbot backportbot Bot commented Oct 5, 2026

Copy link
Copy Markdown

Backport of PR #64963

susnux added 2 commits October 5, 2026 06:11
Resolves e2ee which cannot store unencrypted size displaying size `0 B`
because the Cache entry is initialized always to `unencrypted_size = 0`
in `cacheEntryFromData`.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
…d files

Preferring `unencrypted_size` only when it is greater than zero also drops
the plaintext size of a server side encrypted file whose content is empty,
where the cache holds `size` of one encryption header and `unencrypted_size`
of 0.

Only files carry the server side encryption mark, so an `encrypted` folder
got the flag from end-to-end encryption, which does not maintain
`unencrypted_size`. Decide by node type instead and route the three
diverging conditions through one predicate.

Assisted-by: ClaudeCode:claude-opus-5
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@backportbot
backportbot Bot requested a review from a team as a code owner October 5, 2026 06:12
@backportbot
backportbot Bot requested review from Altahrim, AndyScherzinger, icewind1991, salmart-dev, sorbaugh and susnux and removed request for a team October 5, 2026 06:12
@backportbot backportbot Bot added bug 3. to review Waiting for reviews AI assisted labels Oct 5, 2026
@backportbot backportbot Bot added this to the Nextcloud 35.0.2 milestone Oct 5, 2026
@AndyScherzinger
AndyScherzinger merged commit faaf33c into stable35 Oct 5, 2026
207 of 210 checks passed
@AndyScherzinger
AndyScherzinger deleted the backport/64963/stable35 branch October 5, 2026 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants