fix: suppress back release from reader settings screens

* fix: suppress back release from reader settings screens
* fix: avoid stale back suppression after font errors

Author: uxjulia

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Long-press reader shortcuts that open another screen no longer close or confirm it again when releasing the shortcut button.
 - RoundedRaff's header battery icon and percentage now sit lower to avoid clipping at the top edge.
 - Lyra Carousel now redraws the Home header when restoring cached carousel frames so battery percentage and clock values stay current while navigating between books.
+- Reader-launched settings screens no longer jump back two screens after pressing Back.
 
 ## [v1.3.3] - 2026-06-13
 

src/activities/Activity.cpp

@@ -21,4 +21,9 @@ void Activity::startActivityForResult(std::unique_ptr<Activity>&& activity, Acti
 
 void Activity::setResult(ActivityResult&& result) { this->result = std::move(result); }
 
+void Activity::finishAfterBackPress() {
+  mappedInput.suppressNextBackRelease();
+  finish();
+}
+
 void Activity::finish() { activityManager.popActivity(); }

src/activities/Activity.h

@@ -24,6 +24,10 @@ class Activity {
   ActivityResultHandler resultHandler;
   ActivityResult result;
 
+  // Use when a screen exits on Back press instead of Back release so the
+  // parent screen does not also receive the held button's release.
+  void finishAfterBackPress();
+
  public:
   explicit Activity(std::string name, GfxRenderer& renderer, MappedInputManager& mappedInput)
       : name(std::move(name)), renderer(renderer), mappedInput(mappedInput) {}

src/activities/network/WifiSelectionActivity.cpp

@@ -542,6 +542,7 @@ void WifiSelectionActivity::loop() {
     sConnectionAttemptLoggingActive = false;
 #endif
     WiFi.disconnect();
+    mappedInput.suppressNextBackRelease();
     onComplete(false);
     return;
   }
@@ -588,6 +589,7 @@ void WifiSelectionActivity::loop() {
       onComplete(true);
     } else if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
       // Skip saving, complete anyway
+      mappedInput.suppressNextBackRelease();
       onComplete(true);
     }
     return;
@@ -629,8 +631,13 @@ void WifiSelectionActivity::loop() {
   }
 
   if (state == WifiSelectionState::CONNECTED) {
-    if (mappedInput.wasPressed(MappedInputManager::Button::Back) ||
-        mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+    if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
+      mappedInput.suppressNextBackRelease();
+      onComplete(true);
+      return;
+    }
+
+    if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
       onComplete(true);
     }
     return;
@@ -659,6 +666,7 @@ void WifiSelectionActivity::loop() {
   if (state == WifiSelectionState::NETWORK_LIST) {
     // Check for Back button to exit (cancel)
     if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
+      mappedInput.suppressNextBackRelease();
       onComplete(false);
       return;
     }

src/activities/settings/FontDownloadActivity.cpp

@@ -770,7 +770,7 @@ bool FontDownloadActivity::isSelectedFamilyDeletable() const {
 void FontDownloadActivity::loop() {
   if (state_ == FAMILY_LIST) {
     if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
-      finish();
+      finishAfterBackPress();
       return;
     }
 
@@ -850,7 +850,7 @@ void FontDownloadActivity::loop() {
       errorMessage_.clear();
       errorHint_.clear();
       if (families_.empty()) {
-        finish();
+        finishAfterBackPress();
       } else {
         RenderLock lock(*this);
         state_ = FAMILY_LIST;

src/activities/settings/KOReaderAuthActivity.cpp

@@ -103,8 +103,12 @@ void KOReaderAuthActivity::render(RenderLock&&) {
 
 void KOReaderAuthActivity::loop() {
   if (state == SUCCESS || state == FAILED) {
-    if (mappedInput.wasPressed(MappedInputManager::Button::Back) ||
-        mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+    if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
+      finishAfterBackPress();
+      return;
+    }
+
+    if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
       finish();
     }
   }

src/activities/settings/KOReaderSettingsActivity.cpp

@@ -29,7 +29,7 @@ void KOReaderSettingsActivity::onExit() { Activity::onExit(); }
 
 void KOReaderSettingsActivity::loop() {
   if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
-    finish();
+    finishAfterBackPress();
     return;
   }
 

src/activities/settings/StatusBarSettingsActivity.cpp

@@ -216,7 +216,7 @@ void StatusBarSettingsActivity::onExit() { Activity::onExit(); }
 
 void StatusBarSettingsActivity::loop() {
   if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
-    finish();
+    finishAfterBackPress();
     return;
   }
 

src/activities/util/KeyboardEntryActivity.cpp

@@ -351,6 +351,7 @@ void KeyboardEntryActivity::loop() {
   }
 
   if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
+    mappedInput.suppressNextBackRelease();
     onCancel();
   }