From c9d7ad4607c48b4b3e1544da6237516006e3eac2 Mon Sep 17 00:00:00 2001 From: Jesus Recio Date: Thu, 3 Sep 2026 08:48:51 +0200 Subject: [PATCH 1/2] feat: hide keyboard during countdown. After that, remove error message Signed-off-by: Jesus Recio --- .../android/presentation/security/passcode/PassCodeActivity.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt index cb3157e39b1..b1996e9ce98 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt @@ -228,6 +228,8 @@ class PassCodeActivity : ToolbarActivity(), NumberKeyboardListener, EnableBiomet }) passCodeViewModel.getFinishedTimeToUnlockLiveData.observe(this, Event.EventObserver { binding.lockTime.visibility = View.INVISIBLE + binding.numberKeyboard.visibility = View.VISIBLE + binding.passcodeError.visibility = View.INVISIBLE for (editText: EditText? in passCodeEditTexts) { editText?.isEnabled = true } @@ -347,6 +349,7 @@ class PassCodeActivity : ToolbarActivity(), NumberKeyboardListener, EnableBiomet val timeToUnlock = passCodeViewModel.getTimeToUnlockLeft() if (timeToUnlock > 0) { binding.lockTime.visibility = View.VISIBLE + binding.numberKeyboard.visibility = View.INVISIBLE for (editText: EditText? in passCodeEditTexts) { editText?.isEnabled = false } From d33c526327285b81b770e3fb9c01e987958f0d9d Mon Sep 17 00:00:00 2001 From: Jesus Recio Date: Thu, 3 Sep 2026 09:14:00 +0200 Subject: [PATCH 2/2] chore: add calens file Signed-off-by: Jesus Recio --- changelog/unreleased/4967 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/unreleased/4967 diff --git a/changelog/unreleased/4967 b/changelog/unreleased/4967 new file mode 100644 index 00000000000..13df984c35c --- /dev/null +++ b/changelog/unreleased/4967 @@ -0,0 +1,6 @@ +Bugfix: Hide keyboard and clear error when brute-force countdown ends + +The number keyboard has been hidden during the brute-force protection countdown so users cannot interact with it. The wrong-passcode error message has been cleared once the countdown ends, leaving a clean screen for the next attempt. + +https://github.com/owncloud/android/issues/4874 +https://github.com/owncloud/android/pull/4967