From 47981da98c17de6d3db3691d30f73cb52cfc9982 Mon Sep 17 00:00:00 2001
From: 3urobeat <tomke@goritz.org>
Date: Sun, 6 Sep 2026 20:25:50 +0200
Subject: [PATCH] fix: Fix cover open being able to bypass lock (whoops) and
 hopefully fix flickering during password input

---
 examples/companion_radio/ui-new/UITask.cpp | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/examples/companion_radio/ui-new/UITask.cpp b/examples/companion_radio/ui-new/UITask.cpp
index 9ba6da76..6aaec80f 100644
--- a/examples/companion_radio/ui-new/UITask.cpp
+++ b/examples/companion_radio/ui-new/UITask.cpp
@@ -2731,11 +2731,17 @@ void UITask::pollHallSensor() {
     digitalWrite(PIN_LED, LOW);   // same as the auto-off path -- one less thing lit under a closed cover
 #endif
   } else {   // cover opened
-    _locked = false;
-    syncLockToHome();
-    if (_display && !_display->isOn()) _display->turnOn();
-    uint32_t aoff = autoOffMillis();
-    if (aoff > 0) _auto_off = millis() + aoff;
+    if (passwordLockEnabled()) { // Redirect flow to usual unlock prompt when password is enabled
+      _locked = true;
+      if (_display) _display->turnOn();
+      beginUnlockPrompt();
+    } else {
+      _locked = false;
+      syncLockToHome();
+      if (_display && !_display->isOn()) _display->turnOn();
+      uint32_t aoff = autoOffMillis();
+      if (aoff > 0) _auto_off = millis() + aoff;
+    }
   }
   _next_refresh = 0;
 #endif
@@ -2750,7 +2756,7 @@ void UITask::loop() {
   uint8_t joy_rot = _node_prefs ? _node_prefs->joystick_rotation : JOYSTICK_ROTATION;
   int ev = user_btn.check();
   if (ev == BUTTON_EVENT_CLICK) {
-    if (back_btn.isPressed()) {
+    if (back_btn.isPressed() && !_unlock_kb) {
       // Enter clicked while Back is held — lock/unlock sequence
       if (_display && !_display->isOn()) {
         _display->turnOn();  // turn on display so hints are visible
@@ -2767,6 +2773,11 @@ void UITask::loop() {
       }
       // eat the Enter — don't pass to curr
     } else {
+      // While the password keyboard is open, Back+Enter is just typing
+      if (_unlock_kb) {
+        _lock_seq_count = 0;
+        _lock_seq_ms = 0;
+      }
       enqueueKey(checkDisplayOn(KEY_ENTER));
     }
   } else if (ev == BUTTON_EVENT_LONG_PRESS) {