Merge branch 'feat-kosync-onlongpress' of https://github.com/jpirnay/crosspoint-reader into mybuild

src/activities/reader/EpubReaderActivity.cpp

@@ -153,17 +153,7 @@ void EpubReaderActivity::loop() {
     startActivityForResult(
         std::make_unique<KOReaderSyncActivity>(renderer, mappedInput, epub, epub->getPath(), currentSpineIndex,
                                                currentPage, totalPages),
-        [this](const ActivityResult& result) {
+        [this](const ActivityResult& result) { handleSyncResult(result); });
-          if (!result.isCancelled) {
-            const auto& sync = std::get<SyncResult>(result.data);
-            if (currentSpineIndex != sync.spineIndex || (section && section->currentPage != sync.page)) {
-              RenderLock lock(*this);
-              currentSpineIndex = sync.spineIndex;
-              nextPageNumber = sync.page;
-              section.reset();
-            }
-          }
-        });
     return;
   }
 
@@ -430,28 +420,26 @@ void EpubReaderActivity::onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction
         }
         startActivityForResult(
             std::make_unique<KOReaderSyncActivity>(renderer, mappedInput, epub, epub->getPath(), currentSpineIndex,
-                                                   currentPage, totalPages, paragraphIdx, hasParagraphIdx),
+                                                   currentPage, totalPages),
-            [this](const ActivityResult& result) {
+            [this](const ActivityResult& result) { handleSyncResult(result); });
-              if (!result.isCancelled) {
-                const auto& sync = std::get<SyncResult>(result.data);
-                if (currentSpineIndex != sync.spineIndex || (section && section->currentPage != sync.page)) {
-                  RenderLock lock(*this);
-                  currentSpineIndex = sync.spineIndex;
-                  nextPageNumber = sync.page;
-                  if (sync.hasParagraphIndex) {
-                    pendingParagraphLookup = true;
-                    pendingParagraphIndex = sync.paragraphIndex;
-                  }
-                  section.reset();
-                }
-              }
-            });
       }
       break;
     }
   }
 }
 
+void EpubReaderActivity::handleSyncResult(const ActivityResult& result) {
+  if (!result.isCancelled) {
+    const auto& sync = std::get<SyncResult>(result.data);
+    if (currentSpineIndex != sync.spineIndex || (section && section->currentPage != sync.page)) {
+      RenderLock lock(*this);
+      currentSpineIndex = sync.spineIndex;
+      nextPageNumber = sync.page;
+      section.reset();
+    }
+  }
+}
+
 void EpubReaderActivity::applyOrientation(const uint8_t orientation) {
   // No-op if the selected orientation matches current settings.
   if (SETTINGS.orientation == orientation) {

src/activities/reader/EpubReaderActivity.h

@@ -52,6 +52,7 @@ class EpubReaderActivity final : public Activity {
   // Jump to a percentage of the book (0-100), mapping it to spine and page.
   void jumpToPercent(int percent);
   void onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction action);
+  void handleSyncResult(const ActivityResult& result);
   void applyOrientation(uint8_t orientation);
   void toggleAutoPageTurn(uint8_t selectedPageTurnOption);
   void applyBookReaderOverrides(int8_t embeddedStyleOverride, int8_t imageRenderingOverride);

src/activities/settings/KOReaderSettingsActivity.cpp

@@ -107,8 +107,9 @@ void KOReaderSettingsActivity::handleSelection() {
       // Can't authenticate without credentials - just show message briefly
       return;
     }
-    startActivityForResult(std::make_unique<KOReaderAuthActivity>(renderer, mappedInput, KOReaderAuthActivity::Mode::LOGIN),
+    startActivityForResult(
-                           [](const ActivityResult&) {});
+        std::make_unique<KOReaderAuthActivity>(renderer, mappedInput, KOReaderAuthActivity::Mode::LOGIN),
+        [](const ActivityResult&) {});
   } else if (selectedIndex == 5) {
     // Register
     if (!KOREADER_STORE.hasCredentials()) {