Skip to content

[stable-25.1.x] fix(settings): enable screen lock timeout dropdown when screen lock is toggled on - #6986

Merged
AndyScherzinger merged 1 commit into
stable-25.1.xfrom
backport/6983/stable-25.1.x
Nov 3, 2026
Merged

AndyScherzinger merged 1 commit into
stable-25.1.xfrom
backport/6983/stable-25.1.x

Conversation

@backportbot

@backportbot backportbot Bot commented Nov 2, 2026

Copy link
Copy Markdown

Backport of PR #6983

…s toggled on

The dropdown was only enabled in setupScreenLockSetting() based on the
initial state. Toggling screen lock on afterwards re-enabled the
container but left the dropdown disabled, so it could not be expanded.

Assisted-by: Claude Code:claude-opus-5
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
@backportbot
backportbot Bot requested review from mahibi and rapterjet2004 November 2, 2026 09:55
@backportbot backportbot Bot added 3. to review Waiting for reviews AI assisted labels Nov 2, 2026
@backportbot backportbot Bot added this to the 25.1.0 milestone Nov 2, 2026
@mahibi
mahibi enabled auto-merge November 2, 2026 10:21
@github-actions

github-actions Bot commented Nov 2, 2026

Copy link
Copy Markdown
Contributor

📱 QA build

Download app-qa-debug.apk
QR code Open the QR code for this download
Commit 824076d
Version 6986
Available until 7 days after this build

The QA build installs alongside a released Nextcloud app, so you can keep
using your existing install while testing.

Downloading the file requires a GitHub account, so open this link on the
device you want to test on, or transfer the APK to it.

@AndyScherzinger
AndyScherzinger merged commit 29bae28 into stable-25.1.x Nov 3, 2026
14 of 17 checks passed
@AndyScherzinger
AndyScherzinger deleted the backport/6983/stable-25.1.x branch November 3, 2026 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews AI assisted

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants