Fixes

Co-authored-by: Copilot <copilot@github.com>

src/CrossPointState.h

@@ -56,9 +56,8 @@ struct KOReaderSyncSessionState {
   // completion. Without this, AUTO_PUSH would bounce back into the reader the user just left.
   bool exitToHomeAfterSync = false;
   // Set by RecentBooks / FileBrowser long-press to ask the reader to perform an AUTO_PULL
-  // before rendering its first page. Consumed once on reader entry. Stored separately from
+  // before rendering its first page. Stored by EPUB path so the flag cannot leak across books.
-  // `intent` because the long-press path bypasses `launchKOReaderSync`'s reader-state capture.
+  std::string autoPullEpubPath;
-  bool autoPullOnOpen = false;
 
   void clear() {
     active = false;
@@ -76,7 +75,7 @@ struct KOReaderSyncSessionState {
     resultParagraphIndex = 0;
     resultHasParagraphIndex = false;
     exitToHomeAfterSync = false;
-    autoPullOnOpen = false;
+    autoPullEpubPath.clear();
   }
 };
 

src/JsonSettingsIO.cpp

@@ -91,7 +91,7 @@ bool JsonSettingsIO::saveState(const CrossPointState& s, const char* path) {
   sync["resultParagraphIndex"] = s.koReaderSyncSession.resultParagraphIndex;
   sync["resultHasParagraphIndex"] = s.koReaderSyncSession.resultHasParagraphIndex;
   sync["exitToHomeAfterSync"] = s.koReaderSyncSession.exitToHomeAfterSync;
-  sync["autoPullOnOpen"] = s.koReaderSyncSession.autoPullOnOpen;
+  sync["autoPullEpubPath"] = s.koReaderSyncSession.autoPullEpubPath;
   // Information about a pending bookmark jump
   JsonObject jump = doc["pendingBookmarkJump"].to<JsonObject>();
   jump["active"] = s.pendingBookmarkJump.active;
@@ -148,7 +148,10 @@ bool JsonSettingsIO::loadState(CrossPointState& s, const char* json) {
   s.koReaderSyncSession.resultParagraphIndex = sync["resultParagraphIndex"] | (uint16_t)0;
   s.koReaderSyncSession.resultHasParagraphIndex = sync["resultHasParagraphIndex"] | false;
   s.koReaderSyncSession.exitToHomeAfterSync = sync["exitToHomeAfterSync"] | false;
-  s.koReaderSyncSession.autoPullOnOpen = sync["autoPullOnOpen"] | false;
+  s.koReaderSyncSession.autoPullEpubPath = sync["autoPullEpubPath"] | std::string("");
+  if (s.koReaderSyncSession.autoPullEpubPath.empty() && (sync["autoPullOnOpen"] | false)) {
+    LOG_DBG("CPS", "Legacy autoPullOnOpen state found without epubPath - ignoring");
+  }
 
   JsonObject jump = doc["pendingBookmarkJump"].as<JsonObject>();
   s.pendingBookmarkJump.active = jump["active"] | false;

src/activities/home/FileBrowserActivity.cpp

@@ -187,9 +187,9 @@ void FileBrowserActivity::loop() {
       std::string fullPath = basepath;
       if (fullPath.back() != '/') fullPath += "/";
       fullPath += entry;
-      if (longPress && KOREADER_STORE.hasCredentials()) {
+      if (longPress && KOREADER_STORE.hasCredentials() && FsHelpers::hasEpubExtension(fullPath)) {
         auto& sync = APP_STATE.koReaderSyncSession;
-        sync.autoPullOnOpen = true;
+        sync.autoPullEpubPath = fullPath;
         sync.exitToHomeAfterSync = false;
         APP_STATE.saveToFile();
       }

src/activities/home/RecentBooksActivity.cpp

@@ -56,13 +56,16 @@ void RecentBooksActivity::loop() {
 
   if (mappedInput.wasReleased(MappedInputManager::Button::Confirm) && !recentBooks.empty() &&
       selectorIndex < static_cast<int>(recentBooks.size())) {
-    // Long-press Confirm signals "open with KOReader sync": the reader will perform an
+    // Long-press Confirm signals "open with KOReader sync" only for EPUBs.
-    // AUTO_PULL before rendering its first page. Short-press is the unchanged direct open.
+    // Short-press is unchanged direct open.
     const bool longPress = mappedInput.getHeldTime() >= ReaderUtils::GO_HOME_MS && KOREADER_STORE.hasCredentials();
-    LOG_DBG("RBA", "Selected recent book: %s (sync=%d)", recentBooks[selectorIndex].path.c_str(), longPress ? 1 : 0);
+    const std::string& selectedPath = recentBooks[selectorIndex].path;
-    if (longPress) {
+    const bool isEpubBook = FsHelpers::hasEpubExtension(selectedPath);
+    LOG_DBG("RBA", "Selected recent book: %s (sync=%d epub=%d)", selectedPath.c_str(), longPress ? 1 : 0,
+            isEpubBook ? 1 : 0);
+    if (longPress && isEpubBook) {
       auto& sync = APP_STATE.koReaderSyncSession;
-      sync.autoPullOnOpen = true;
+      sync.autoPullEpubPath = selectedPath;
       sync.exitToHomeAfterSync = false;
       APP_STATE.saveToFile();
     }

src/activities/reader/EpubReaderActivity.cpp

@@ -898,6 +898,14 @@ bool EpubReaderActivity::tryAutoPushOnClose() {
   if (!epub) {
     return false;
   }
+
+  const int spineCount = epub->getSpineItemsCount();
+  if (spineCount == 0 || currentSpineIndex >= spineCount || !section) {
+    LOG_DBG("ERS", "Skipping AUTO_PUSH on end-of-book sentinel: spine=%d section=%s", currentSpineIndex,
+            section ? "present" : "null");
+    return false;
+  }
+
   // exitToHomeAfterSync flag is set inside launchKOReaderSync for AUTO_PUSH mode.
   launchKOReaderSync(SyncLaunchMode::AUTO_PUSH);
   return true;

src/activities/reader/ReaderActivity.cpp

@@ -112,14 +112,14 @@ void ReaderActivity::onGoToEpubReader(std::unique_ptr<Epub> epub) {
   const auto epubPath = epub->getPath();
   currentBookPath = epubPath;
 
-  // Long-press Confirm on RecentBooks/FileBrowser sets autoPullOnOpen so the user can ask
+  // Long-press Confirm on RecentBooks/FileBrowser sets autoPullEpubPath so the user can
-  // for KOReader sync at open time. Route into the sync activity instead of creating the
+  // ask for KOReader sync at open time. Route into the sync activity instead of creating the
   // reader; sync's resumeReader() will create the reader once the remote position is applied.
   // Pull-only mode does not need accurate local reader state, so we hand off zeros for spine/page.
   auto& sync = APP_STATE.koReaderSyncSession;
-  if (sync.autoPullOnOpen && KOREADER_STORE.hasCredentials()) {
+  if (!sync.autoPullEpubPath.empty() && sync.autoPullEpubPath == epubPath && KOREADER_STORE.hasCredentials()) {
     LOG_DBG("READER", "AUTO_PULL on open: %s", epubPath.c_str());
-    sync.autoPullOnOpen = false;  // consume the flag
+    sync.autoPullEpubPath.clear();  // consume the flag
     sync.active = true;
     sync.epubPath = epubPath;
     sync.spineIndex = 0;