fb0af32ec0
## Summary * **What is the goal of this PR?** Move the "Sync Progress" option from TOC (Chapter Selection) screen to the Reader Menu, and fix use-after-free crashes related to callback handling in activity lifecycle. * **What changes are included?** - Added "Sync Progress" as a menu item in `EpubReaderMenuActivity` (now 4 items: Go to Chapter, Sync Progress, Go Home, Delete Book Cache) - Removed sync-related logic from `EpubReaderChapterSelectionActivity` - TOC now only displays chapters - Implemented `pendingGoHome` and `pendingSubactivityExit` flags in `EpubReaderActivity` to safely handle activity destruction - Fixed GO_HOME, DELETE_CACHE, and SYNC menu actions to use deferred callbacks avoiding use-after-free ## Additional Context * Root cause of crashes: callbacks like `onGoHome()` or `onCancel()` invoked from activity handlers could destroy the current activity while code was still executing, causing use-after-free and race conditions with FreeRTOS display task. * Solution: Deferred execution pattern - set flags and process them in `loop()` after all nested activity loops have safely returned. * Files changed: `EpubReaderMenuActivity.h`, `EpubReaderActivity.h/.cpp`, `EpubReaderChapterSelectionActivity.h/.cpp` --- ### 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? _**YES**_ Co-authored-by: danoooob <danoooob@example.com> Co-authored-by: Dave Allie <dave@daveallie.com>
56 lines
2.1 KiB
C++
56 lines
2.1 KiB
C++
#pragma once
|
|
#include <Epub.h>
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/semphr.h>
|
|
#include <freertos/task.h>
|
|
|
|
#include <memory>
|
|
|
|
#include "../ActivityWithSubactivity.h"
|
|
|
|
class EpubReaderChapterSelectionActivity final : public ActivityWithSubactivity {
|
|
std::shared_ptr<Epub> epub;
|
|
std::string epubPath;
|
|
TaskHandle_t displayTaskHandle = nullptr;
|
|
SemaphoreHandle_t renderingMutex = nullptr;
|
|
int currentSpineIndex = 0;
|
|
int currentPage = 0;
|
|
int totalPagesInSpine = 0;
|
|
int selectorIndex = 0;
|
|
bool updateRequired = false;
|
|
const std::function<void()> onGoBack;
|
|
const std::function<void(int newSpineIndex)> onSelectSpineIndex;
|
|
const std::function<void(int newSpineIndex, int newPage)> onSyncPosition;
|
|
|
|
// Number of items that fit on a page, derived from logical screen height.
|
|
// This adapts automatically when switching between portrait and landscape.
|
|
int getPageItems() const;
|
|
|
|
// Total TOC items count
|
|
int getTotalItems() const;
|
|
|
|
static void taskTrampoline(void* param);
|
|
[[noreturn]] void displayTaskLoop();
|
|
void renderScreen();
|
|
|
|
public:
|
|
explicit EpubReaderChapterSelectionActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
|
const std::shared_ptr<Epub>& epub, const std::string& epubPath,
|
|
const int currentSpineIndex, const int currentPage,
|
|
const int totalPagesInSpine, const std::function<void()>& onGoBack,
|
|
const std::function<void(int newSpineIndex)>& onSelectSpineIndex,
|
|
const std::function<void(int newSpineIndex, int newPage)>& onSyncPosition)
|
|
: ActivityWithSubactivity("EpubReaderChapterSelection", renderer, mappedInput),
|
|
epub(epub),
|
|
epubPath(epubPath),
|
|
currentSpineIndex(currentSpineIndex),
|
|
currentPage(currentPage),
|
|
totalPagesInSpine(totalPagesInSpine),
|
|
onGoBack(onGoBack),
|
|
onSelectSpineIndex(onSelectSpineIndex),
|
|
onSyncPosition(onSyncPosition) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
};
|