Skip to content

[pull] master from nextcloud:master - #1505

Merged
pull[bot] merged 19 commits into
ConnectionMaster:masterfrom
nextcloud:master
Aug 3, 2026
Merged

[pull] master from nextcloud:master#1505
pull[bot] merged 19 commits into
ConnectionMaster:masterfrom
nextcloud:master

Conversation

@pull

@pull pull Bot commented Aug 3, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

CarlSchwan and others added 19 commits July 20, 2026 23:44
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Files with 0 bytes no longer incorrectly report as 8192 bytes. Widens unencryptedSize
to ?int, fixes verifyUnencryptedSize to compare against header size instead of 0,
and corrects Scanner to populate unencrypted_size on initial upload.

Assisted-by: ClaudeCode:claude-opus-4-6
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Stephen Cuppett <steve@cuppett.com>
…stency

Apply come-nc's reviewer suggestions on Scanner.php:
- Simplify cached unencrypted_size skip condition to explicit == 0 check
- Remove redundant !isset guard on new-file path

Fix remaining > 0 / !== 0 guards that treated zero as "no unencrypted_size":
- FileInfo constructor: use encrypted flag for rawSize (getSize(false) path)
- FileInfo::addSubEntry: use encrypted flag for sub-mount accumulation
- Cache::calculateFolderSizeInner: use encrypted column instead of > 0

Add tests covering zero-byte encrypted file scenarios:
- FileInfoTest: getSize(true/false) for zero-byte encrypted files
- CacheTest: getUnencryptedSize and calculateFolderSize with encrypted=1,size=0
- EncryptionTest: verifyUnencryptedSize data provider cases for header-only files

Assisted-by: ClaudeCode:claude-opus-4-6
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Stephen Cuppett <scuppett@redhat.com>
…Byte

Add a second encrypted child with unencrypted_size=100 so the write-back
gate in calculateFolderSizeInner ($unencryptedMax > 0) actually opens.
The original single zero-byte child left the gate closed, meaning the
test passed against the DB default rather than the computed value.

With two children the assertion distinguishes the fixed code (result: 100)
from the old buggy code (result: 8292, falling back to on-disk size for
the zero-byte child).

Assisted-by: ClaudeCode:claude-opus-4-6
Signed-off-by: Stephen Cuppett <scuppett@redhat.com>
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Avoid doing some reflection

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Bumps the github-actions group with 8 updates:

| Package | From | To |
| --- | --- | --- |
| [dorny/paths-filter](https://github.com/dorny/paths-filter) | `4.0.1` | `4.0.2` |
| [actions/checkout](https://github.com/actions/checkout) | `7.0.0` | `7.0.1` |
| [github/codeql-action/init](https://github.com/github/codeql-action) | `4.36.3` | `4.37.3` |
| [github/codeql-action/analyze](https://github.com/github/codeql-action) | `4.36.3` | `4.37.3` |
| [actions/setup-node](https://github.com/actions/setup-node) | `6.4.0` | `7.0.0` |
| [LizardByte/actions/actions/setup_python](https://github.com/lizardbyte/actions) | `2026.625.20301` | `2026.728.214955` |
| [actions/stale](https://github.com/actions/stale) | `10.3.0` | `11.0.0` |
| [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) | `4.36.3` | `4.37.3` |


Updates `dorny/paths-filter` from 4.0.1 to 4.0.2
- [Release notes](https://github.com/dorny/paths-filter/releases)
- [Changelog](https://github.com/dorny/paths-filter/blob/master/CHANGELOG.md)
- [Commits](dorny/paths-filter@v4.0.1...7b450ff)

Updates `actions/checkout` from 7.0.0 to 7.0.1
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@9c091bb...3d3c42e)

Updates `github/codeql-action/init` from 4.36.3 to 4.37.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@54f647b...e4fba86)

Updates `github/codeql-action/analyze` from 4.36.3 to 4.37.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@54f647b...e4fba86)

Updates `actions/setup-node` from 6.4.0 to 7.0.0
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v6.4.0...8207627)

Updates `LizardByte/actions/actions/setup_python` from 2026.625.20301 to 2026.728.214955
- [Release notes](https://github.com/lizardbyte/actions/releases)
- [Commits](LizardByte/actions@a468509...d0ae7f8)

Updates `actions/stale` from 10.3.0 to 11.0.0
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](actions/stale@eb5cf3a...4391f3d)

Updates `github/codeql-action/upload-sarif` from 4.36.3 to 4.37.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@54f647b...e4fba86)

---
updated-dependencies:
- dependency-name: dorny/paths-filter
  dependency-version: 4.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: actions/checkout
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: github/codeql-action/init
  dependency-version: 4.37.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: github/codeql-action/analyze
  dependency-version: 4.37.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: actions/setup-node
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: LizardByte/actions/actions/setup_python
  dependency-version: 2026.728.214955
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: actions/stale
  dependency-version: 11.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: github/codeql-action/upload-sarif
  dependency-version: 4.37.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
…pported-desktop-version

chore: Update minimum supported desktop version to 3.3.50
perf(user-display-name): Check memory cache before trying redis
fix(encryption): Correctly report size for zero-byte encrypted files
…thub-actions-70f7a78429

chore(deps): bump the github-actions group with 8 updates
…ibute

feat: Add missing NoSubAdminRequired attribute
More logging around partfile rename failures
…ig-type

fix(provisioning_api): read newUser.sendEmail as a boolean
@pull pull Bot locked and limited conversation to collaborators Aug 3, 2026
@pull pull Bot added the ⤵️ pull label Aug 3, 2026
@pull
pull Bot merged commit f707400 into ConnectionMaster:master Aug 3, 2026
7 of 17 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants