fix: back navigation from BMPViewer (#1597)

## Summary

This fixes navigating back from the BMP Viewer to the FileBrowser which
was broken when moving to the new ActivityManager

This is fixed by making FileBrowserActivity able to take a full file
path on enter and splitting the basePath and fileName from it and
navigating to the correct place.

fixes:
https://github.com/crosspoint-reader/crosspoint-reader/issues/1553

duplicates:
https://github.com/crosspoint-reader/crosspoint-reader/pull/910 to some
extend but mine has the file cursor at the correct file instead of the
first one in the folder

## Additional Context

* Add any other information that might be helpful for the reviewer
(e.g., performance implications, potential risks,
  specific areas to focus on).

---

### AI Usage

While CrossPoint doesn't have restrictions on AI tools in contributing,
please be transparent about their usage as it
helps set the right context for reviewers.

Did you use AI tools to help write this code? _**PARTIALLY**_

---------

Co-authored-by: Jan Ivanov <jan.ivanov@sirma.com>

lib/FsHelpers/FsHelpers.cpp

@@ -78,4 +78,12 @@ bool hasTxtExtension(std::string_view fileName) { return checkFileExtension(file
 
 bool hasMarkdownExtension(std::string_view fileName) { return checkFileExtension(fileName, ".md"); }
 
+std::string extractFolderPath(const std::string& filePath) {
+  const auto lastSlash = filePath.find_last_of('/');
+  if (lastSlash == std::string::npos || lastSlash == 0) {
+    return "/";
+  }
+  return filePath.substr(0, lastSlash);
+}
+
 }  // namespace FsHelpers

lib/FsHelpers/FsHelpers.h

@@ -55,4 +55,6 @@ inline bool hasTxtExtension(const String& fileName) {
 // Check for .md extension (case-insensitive)
 bool hasMarkdownExtension(std::string_view fileName);
 
+std::string extractFolderPath(const std::string& filePath);
+
 }  // namespace FsHelpers

src/activities/home/FileBrowserActivity.cpp

@@ -108,9 +108,28 @@ void FileBrowserActivity::loadFiles() {
 void FileBrowserActivity::onEnter() {
   Activity::onEnter();
 
-  loadFiles();
   selectorIndex = 0;
 
+  auto root = Storage.open(basepath.c_str());
+  if (!root) {
+    basepath = "/";
+    loadFiles();
+  } else if (!root.isDirectory()) {
+    root.close();
+    lockLongPressBack = mappedInput.isPressed(MappedInputManager::Button::Back);
+
+    const std::string oldPath = basepath;
+    basepath = FsHelpers::extractFolderPath(basepath);
+    loadFiles();
+
+    const auto pos = oldPath.find_last_of('/');
+    const std::string fileName = oldPath.substr(pos + 1);
+    selectorIndex = findEntry(fileName);
+  } else {
+    root.close();
+    loadFiles();
+  }
+
   requestUpdate();
 }
 
@@ -129,11 +148,19 @@ void FileBrowserActivity::clearFileMetadata(const std::string& fullPath) {
 
 void FileBrowserActivity::loop() {
   // Long press BACK (1s+) goes to root folder
+  // but Long press BACK (1s+) from ReaderActivity sends us here with the MappedInput already set.
+  // So ignore it the first time.
   if (mappedInput.isPressed(MappedInputManager::Button::Back) && mappedInput.getHeldTime() >= GO_HOME_MS &&
-      basepath != "/") {
+      basepath != "/" && !lockLongPressBack) {
     basepath = "/";
     loadFiles();
     selectorIndex = 0;
+    requestUpdate();
+    return;
+  }
+
+  if (lockLongPressBack && mappedInput.wasReleased(MappedInputManager::Button::Back)) {
+    lockLongPressBack = false;
     return;
   }
 

src/activities/home/FileBrowserActivity.h

@@ -17,6 +17,8 @@ class FileBrowserActivity final : public Activity {
 
   size_t selectorIndex = 0;
 
+  bool lockLongPressBack = false;
+
   // Files state
   std::string basepath = "/";
   std::vector<std::string> files;

src/activities/reader/ReaderActivity.cpp

@@ -13,14 +13,6 @@
 #include "activities/util/BmpViewerActivity.h"
 #include "activities/util/FullScreenMessageActivity.h"
 
-std::string ReaderActivity::extractFolderPath(const std::string& filePath) {
-  const auto lastSlash = filePath.find_last_of('/');
-  if (lastSlash == std::string::npos || lastSlash == 0) {
-    return "/";
-  }
-  return filePath.substr(0, lastSlash);
-}
-
 bool ReaderActivity::isXtcFile(const std::string& path) { return FsHelpers::hasXtcExtension(path); }
 
 bool ReaderActivity::isTxtFile(const std::string& path) {
@@ -77,7 +69,7 @@ std::unique_ptr<Txt> ReaderActivity::loadTxt(const std::string& path) {
 
 void ReaderActivity::goToLibrary(const std::string& fromBookPath) {
   // If coming from a book, start in that book's folder; otherwise start from root
-  auto initialPath = fromBookPath.empty() ? "/" : extractFolderPath(fromBookPath);
+  auto initialPath = fromBookPath.empty() ? "/" : FsHelpers::extractFolderPath(fromBookPath);
   activityManager.goToFileBrowser(std::move(initialPath));
 }
 

src/activities/reader/ReaderActivity.h

@@ -18,7 +18,6 @@ class ReaderActivity final : public Activity {
   static bool isTxtFile(const std::string& path);
   static bool isBmpFile(const std::string& path);
 
-  static std::string extractFolderPath(const std::string& filePath);
   void goToLibrary(const std::string& fromBookPath = "");
   void onGoToEpubReader(std::unique_ptr<Epub> epub);
   void onGoToXtcReader(std::unique_ptr<Xtc> xtc);

src/activities/util/BmpViewerActivity.cpp

@@ -94,7 +94,7 @@ void BmpViewerActivity::loop() {
   Activity::loop();
 
   if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
-    onGoHome();
+    activityManager.goToFileBrowser(filePath);
     return;
   }
 }