Wylan SwetsandClaude Sonnet 4.6
e64155ed63
## Summary * **What is the goal of this PR?** Fix KOSync failing with "Network error" on large/complex EPUBs, and simplify the sync navigation flow by removing the callback/result pattern. * **What changes are included?** This PR combines the approaches from #1855 and #1760 into a single, cleaner solution: **Memory fix (from #1855):** - `EpubReaderActivity` pre-computes the local KOReader position and chapter name, then explicitly releases `epub` and `section` before launching `KOReaderSyncActivity`. This frees ~65KB measured on device, giving the TLS handshake sufficient heap. The root cause was `MBEDTLS_ERR_X509_ALLOC_FAILED` (-0x2880) when a 3-cert chain consumed ~48KB during the handshake with only ~50KB available. - `KOReaderSyncActivity` no longer receives a `shared_ptr<Epub>` at construction — it lazy-loads the Epub after TLS only if remote progress is found (`ensureEpubLoaded()`). - Added `MIN_HEAP_FOR_TLS = 55000` guard in `KOReaderSyncClient` — returns `LOW_MEMORY` early if aggregate free heap is too low before attempting a TLS connection. **Navigation simplification (from #1760):** - Replaced `startActivityForResult` + callback with `activityManager.replaceActivity` / `activityManager.goToReader`. Progress is saved to `progress.bin` before the epub is released (cancel/upload paths) and in `saveProgressAndReturn` (apply remote path). The reader re-launches from the saved position naturally via `goToReader`, eliminating the need to reload the epub in a callback. - Extracted `ReaderUtils::saveProgress()` as a shared helper used by both `EpubReaderActivity` and `KOReaderSyncActivity`. - Added `STR_SAVE_PROGRESS_FAILED` to all 22 language files for the case where writing the synced position to SD fails. **Orientation fix (found during device testing):** - `EpubReaderActivity::onExit()` resets the renderer to portrait before destruction. With `replaceActivity` the reader is fully torn down before KOSync starts, so KOSync was always rendering in portrait even when reading in landscape. Fixed by calling `ReaderUtils::applyOrientation` in `KOReaderSyncActivity::onEnter()`. ## Additional Context Heap measurements on device (large EPUB with complex CSS): | Metric | Before | After | |---|---|---| | Heap before Epub release | 88,156 bytes | — | | Heap after Epub release | — | 153,892 bytes (+65,736) | | Heap at TLS handshake | ~50,000 bytes (fails) | ~116,384 bytes (passes) | | Min-free-ever during sync session | 2,600 bytes | 33,052 bytes | | TLS result | `MBEDTLS_ERR_X509_ALLOC_FAILED` | HTTP 200 | Tested on device: sync from inside a large EPUB in both portrait and landscape, cancel, apply remote progress, upload local progress. --- ### AI Usage Did you use AI tools to help write this code? _**YES**_ --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
71 lines
2.7 KiB
C++
71 lines
2.7 KiB
C++
#pragma once
|
|
#include <Epub.h>
|
|
#include <Epub/FootnoteEntry.h>
|
|
#include <Epub/Section.h>
|
|
|
|
#include <optional>
|
|
|
|
#include "EpubReaderMenuActivity.h"
|
|
#include "activities/Activity.h"
|
|
|
|
class EpubReaderActivity final : public Activity {
|
|
std::shared_ptr<Epub> epub;
|
|
std::unique_ptr<Section> section = nullptr;
|
|
int currentSpineIndex = 0;
|
|
int nextPageNumber = 0;
|
|
std::optional<uint16_t> pendingPageJump;
|
|
// Set when navigating to a footnote href with a fragment (e.g. #note1).
|
|
// Cleared on the next render after the new section loads and resolves it to a page.
|
|
std::string pendingAnchor;
|
|
int pagesUntilFullRefresh = 0;
|
|
int cachedSpineIndex = 0;
|
|
int cachedChapterTotalPageCount = 0;
|
|
unsigned long lastPageTurnTime = 0UL;
|
|
unsigned long pageTurnDuration = 0UL;
|
|
// Signals that the next render should reposition within the newly loaded section
|
|
// based on a cross-book percentage jump.
|
|
bool pendingPercentJump = false;
|
|
// Normalized 0.0-1.0 progress within the target spine item, computed from book percentage.
|
|
float pendingSpineProgress = 0.0f;
|
|
bool pendingScreenshot = false;
|
|
bool pendingSyncSaveError = false;
|
|
bool skipNextButtonCheck = false; // Skip button processing for one frame after subactivity exit
|
|
bool automaticPageTurnActive = false;
|
|
|
|
// Footnote support
|
|
std::vector<FootnoteEntry> currentPageFootnotes;
|
|
struct SavedPosition {
|
|
int spineIndex;
|
|
int pageNumber;
|
|
};
|
|
static constexpr int MAX_FOOTNOTE_DEPTH = 3;
|
|
SavedPosition savedPositions[MAX_FOOTNOTE_DEPTH] = {};
|
|
int footnoteDepth = 0;
|
|
|
|
void renderContents(std::unique_ptr<Page> page, int orientedMarginTop, int orientedMarginRight,
|
|
int orientedMarginBottom, int orientedMarginLeft);
|
|
void renderStatusBar() const;
|
|
void silentIndexNextChapterIfNeeded(uint16_t viewportWidth, uint16_t viewportHeight);
|
|
bool saveProgress(int spineIndex, int currentPage, int pageCount);
|
|
// 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 applyOrientation(uint8_t orientation);
|
|
void toggleAutoPageTurn(uint8_t selectedPageTurnOption);
|
|
void pageTurn(bool isForwardTurn);
|
|
|
|
// Footnote navigation
|
|
void navigateToHref(const std::string& href, bool savePosition = false);
|
|
void restoreSavedPosition();
|
|
|
|
public:
|
|
explicit EpubReaderActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, std::unique_ptr<Epub> epub)
|
|
: Activity("EpubReader", renderer, mappedInput), epub(std::move(epub)) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
void render(RenderLock&& lock) override;
|
|
bool isReaderActivity() const override { return true; }
|
|
ScreenshotInfo getScreenshotInfo() const override;
|
|
};
|