eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: free Epub RAM and simplify KOSync navigation via ActivityManager (#1860)

Browse Source 
## 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>
This commit is contained in:
Wylan Swets
2026-05-08 22:01:31 -05:00
committed by GitHub
co-authored by Claude Sonnet 4.6
parent 7993b2bb97
commit e64155ed63
29 changed files with 221 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/I18n/translations/belarusian.yaml
+1
View File
@@ -254,6 +254,7 @@ STR_NO_REMOTE_MSG: "Аддалены прагрэс не знойдзены"
STR_UPLOAD_PROMPT: "Адправіць бягучую пазіцыю?"
STR_UPLOAD_SUCCESS: "Прагрэс адпраўлены!"
STR_SYNC_FAILED_MSG: "Памылка сінхранізацыі"
STR_SAVE_PROGRESS_FAILED: "Не ўдалося захаваць прагрэс"
STR_SECTION_PREFIX: "Раздзел"
STR_UPLOAD: "Адправіць"
STR_BOOK_S_STYLE: "Стыль кнігі"
lib/I18n/translations/catalan.yaml
+1
View File
@@ -282,6 +282,7 @@ STR_NO_REMOTE_MSG: "No s'ha trobat progrés remot"
STR_UPLOAD_PROMPT: "Voleu pujar la posició actual?"
STR_UPLOAD_SUCCESS: "Progrés pujat!"
STR_SYNC_FAILED_MSG: "Sincronització fallida"
STR_SAVE_PROGRESS_FAILED: "No s'ha pogut desar el progrés"
STR_SECTION_PREFIX: "Secció "
STR_UPLOAD: "Puja"
STR_BOOK_S_STYLE: "Estil del llibre"
lib/I18n/translations/czech.yaml
+1
View File
@@ -259,6 +259,7 @@ STR_NO_REMOTE_MSG: "Nenalezen žádný vzdálený postup"
STR_UPLOAD_PROMPT: "Nahrát aktuální pozici?"
STR_UPLOAD_SUCCESS: "Postup nahrán!"
STR_SYNC_FAILED_MSG: "Synchronizace se nezdařila"
STR_SAVE_PROGRESS_FAILED: "Nepodařilo se uložit pokrok"
STR_SECTION_PREFIX: "Sekce"
STR_UPLOAD: "Nahrát"
STR_BOOK_S_STYLE: "Styl knihy"
lib/I18n/translations/danish.yaml
+1
View File
@@ -282,6 +282,7 @@ STR_NO_REMOTE_MSG: "Ingen fjernfremskridt fundet"
STR_UPLOAD_PROMPT: "Upload nuværende position?"
STR_UPLOAD_SUCCESS: "Fremskridt uploadet!"
STR_SYNC_FAILED_MSG: "Synkronisering mislykkedes"
STR_SAVE_PROGRESS_FAILED: "Kunne ikke gemme fremskridt"
STR_SECTION_PREFIX: "Afsnit "
STR_UPLOAD: "Upload"
STR_BOOK_S_STYLE: "Bogens stil"
lib/I18n/translations/dutch.yaml
+1
View File
@@ -282,6 +282,7 @@ STR_NO_REMOTE_MSG: "Geen externe voortgang gevonden"
STR_UPLOAD_PROMPT: "Huidige positie uploaden?"
STR_UPLOAD_SUCCESS: "Voortgang geüpload!"
STR_SYNC_FAILED_MSG: "Sync mislukt"
STR_SAVE_PROGRESS_FAILED: "Voortgang opslaan mislukt"
STR_SECTION_PREFIX: "Sectie "
STR_UPLOAD: "Uploaden"
STR_BOOK_S_STYLE: "Stijl van boek"
lib/I18n/translations/english.yaml
+1
View File
@@ -291,6 +291,7 @@ STR_NO_REMOTE_MSG: "No remote progress found"
STR_UPLOAD_PROMPT: "Upload current position?"
STR_UPLOAD_SUCCESS: "Progress uploaded!"
STR_SYNC_FAILED_MSG: "Sync failed"
STR_SAVE_PROGRESS_FAILED: "Could not save progress"
STR_SECTION_PREFIX: "Section "
STR_UPLOAD: "Upload"
STR_BOOK_S_STYLE: "Book's Style"
lib/I18n/translations/finnish.yaml
+1
View File
@@ -257,6 +257,7 @@ STR_NO_REMOTE_MSG: "Etäedistymistä ei löytynyt"
STR_UPLOAD_PROMPT: "Lähetä nykyinen sijainti?"
STR_UPLOAD_SUCCESS: "Edistyminen lähetetty!"
STR_SYNC_FAILED_MSG: "Synkronointi epäonnistui"
STR_SAVE_PROGRESS_FAILED: "Edistymisen tallennus epäonnistui"
STR_SECTION_PREFIX: "Osio "
STR_UPLOAD: "Lähetä"
STR_BOOK_S_STYLE: "Kirjan tyyli"
lib/I18n/translations/french.yaml
+1
View File
@@ -283,6 +283,7 @@ STR_NO_REMOTE_MSG: "Aucune progression en ligne"
STR_UPLOAD_PROMPT: "Envoyer position actuelle ?"
STR_UPLOAD_SUCCESS: "Progression envoyée !"
STR_SYNC_FAILED_MSG: "Échec de la synchro"
STR_SAVE_PROGRESS_FAILED: "Échec de l'enregistrement"
STR_SECTION_PREFIX: "Section "
STR_UPLOAD: "Envoyer"
STR_BOOK_S_STYLE: "Style du livre"
lib/I18n/translations/german.yaml
+1
View File
@@ -284,6 +284,7 @@ STR_NO_REMOTE_MSG: "Kein externer Fortschritt"
STR_UPLOAD_PROMPT: "Aktuelle Position hochladen?"
STR_UPLOAD_SUCCESS: "Hochgeladen!"
STR_SYNC_FAILED_MSG: "Fehlgeschlagen"
STR_SAVE_PROGRESS_FAILED: "Fortschritt konnte nicht gespeichert werden"
STR_SECTION_PREFIX: "Abschnitt"
STR_UPLOAD: "Hochladen"
STR_BOOK_S_STYLE: "Buch-Stil"
lib/I18n/translations/hungarian.yaml
+1
View File
@@ -279,6 +279,7 @@ STR_NO_REMOTE_MSG: "Nem található távoli haladás"
STR_UPLOAD_PROMPT: "Jelenlegi pozíció feltöltése?"
STR_UPLOAD_SUCCESS: "Haladás feltöltve!"
STR_SYNC_FAILED_MSG: "Szinkronizálás sikertelen"
STR_SAVE_PROGRESS_FAILED: "A haladás mentése sikertelen"
STR_SECTION_PREFIX: "Szakasz "
STR_UPLOAD: "Feltöltés"
STR_BOOK_S_STYLE: "Könyv stílusa"
lib/I18n/translations/italian.yaml
+1
View File
@@ -283,6 +283,7 @@ STR_NO_REMOTE_MSG: "Nessun avanzamento remoto trovato"
STR_UPLOAD_PROMPT: "Inviare la posizione attuale?"
STR_UPLOAD_SUCCESS: "Avanzamenti inviati!"
STR_SYNC_FAILED_MSG: "Sincronizzazione non riuscita"
STR_SAVE_PROGRESS_FAILED: "Impossibile salvare il progresso"
STR_SECTION_PREFIX: "Sezione "
STR_UPLOAD: "Carica"
STR_BOOK_S_STYLE: "Stile libro"
lib/I18n/translations/kazakh.yaml
+1
View File
@@ -253,6 +253,7 @@ STR_NO_REMOTE_MSG: "Қашықтағы үлгерім табылмады"
STR_UPLOAD_PROMPT: "Ағымдағы орынды жүктеп салу керек пе?"
STR_UPLOAD_SUCCESS: "Үлгерім жүктеп салынды!"
STR_SYNC_FAILED_MSG: "Синхрондау сәтсіз"
STR_SAVE_PROGRESS_FAILED: "Прогресті сақтау мүмкін болмады"
STR_SECTION_PREFIX: "Бөлім "
STR_UPLOAD: "Жүктеп салу"
STR_BOOK_S_STYLE: "Кітап стилі"
lib/I18n/translations/lithuanian.yaml
+1
View File
@@ -279,6 +279,7 @@ STR_NO_REMOTE_MSG: "Progresų nerasta"
STR_UPLOAD_PROMPT: "Įkelti poziciją?"
STR_UPLOAD_SUCCESS: "Įkelta!"
STR_SYNC_FAILED_MSG: "Nepavyko"
STR_SAVE_PROGRESS_FAILED: "Nepavyko išsaugoti progreso"
STR_SECTION_PREFIX: "Dalis "
STR_UPLOAD: "Įkelti"
STR_BOOK_S_STYLE: "Knygos stilius"
lib/I18n/translations/polish.yaml
+1
View File
@@ -282,6 +282,7 @@ STR_NO_REMOTE_MSG: "Nie znaleziono zdalnego postępu"
STR_UPLOAD_PROMPT: "Wysłać obecną pozycję?"
STR_UPLOAD_SUCCESS: "Postęp wysłany!"
STR_SYNC_FAILED_MSG: "Synchronizacja nieudana"
STR_SAVE_PROGRESS_FAILED: "Nie udało się zapisać postępu"
STR_SECTION_PREFIX: "Sekcja "
STR_UPLOAD: "Wyślij"
STR_BOOK_S_STYLE: "Styl książki"
lib/I18n/translations/portuguese.yaml
+1
View File
@@ -259,6 +259,7 @@ STR_NO_REMOTE_MSG: "Nenhum progresso remoto encontrado"
STR_UPLOAD_PROMPT: "Enviar posição atual?"
STR_UPLOAD_SUCCESS: "Progresso enviado!"
STR_SYNC_FAILED_MSG: "Falha na sincronização"
STR_SAVE_PROGRESS_FAILED: "Não foi possível salvar o progresso"
STR_SECTION_PREFIX: "Seção"
STR_UPLOAD: "Enviar"
STR_BOOK_S_STYLE: "Estilo do livro"
lib/I18n/translations/romanian.yaml
+1
View File
@@ -282,6 +282,7 @@ STR_NO_REMOTE_MSG: "Niciun progres remote găsit"
STR_UPLOAD_PROMPT: "Încărcaţi poziţia curentă?"
STR_UPLOAD_SUCCESS: "Progres încărcat!"
STR_SYNC_FAILED_MSG: "Sincronizare eşuată"
STR_SAVE_PROGRESS_FAILED: "Nu s-a putut salva progresul"
STR_SECTION_PREFIX: "Secţiune "
STR_UPLOAD: "Încărcare"
STR_BOOK_S_STYLE: "Stilul cărţii"
lib/I18n/translations/russian.yaml
+1
View File
@@ -286,6 +286,7 @@ STR_NO_REMOTE_MSG: "Удалённый прогресс не найден"
STR_UPLOAD_PROMPT: "Отправить текущую позицию?"
STR_UPLOAD_SUCCESS: "Прогресс отправлен!"
STR_SYNC_FAILED_MSG: "Ошибка синхронизации"
STR_SAVE_PROGRESS_FAILED: "Не удалось сохранить прогресс"
STR_SECTION_PREFIX: "Раздел "
STR_UPLOAD: "Отправить"
STR_BOOK_S_STYLE: "Стиль книги"
lib/I18n/translations/slovenian.yaml
+1
View File
@@ -279,6 +279,7 @@ STR_NO_REMOTE_MSG: "Oddaljen napredek ni bil najden"
STR_UPLOAD_PROMPT: "Naložim trenutno pozicijo?"
STR_UPLOAD_SUCCESS: "Napredek naložen!"
STR_SYNC_FAILED_MSG: "Sinhronizacija ni uspela"
STR_SAVE_PROGRESS_FAILED: "Napredka ni bilo mogoče shraniti"
STR_SECTION_PREFIX: "Razdelek "
STR_UPLOAD: "Naloži"
STR_BOOK_S_STYLE: "Slog knjige"
lib/I18n/translations/spanish.yaml
+1
View File
@@ -283,6 +283,7 @@ STR_NO_REMOTE_MSG: "No se encontró progreso remoto"
STR_UPLOAD_PROMPT: "¿Subir posición actual?"
STR_UPLOAD_SUCCESS: "¡Progreso subido!"
STR_SYNC_FAILED_MSG: "Fallo de sincronización"
STR_SAVE_PROGRESS_FAILED: "No se pudo guardar el progreso"
STR_SECTION_PREFIX: "Secc.:"
STR_UPLOAD: "Subir"
STR_BOOK_S_STYLE: "Estilo del libro"
lib/I18n/translations/swedish.yaml
+1
View File
@@ -288,6 +288,7 @@ STR_NO_REMOTE_MSG: "Inga fjärrframsteg funna"
STR_UPLOAD_PROMPT: "Ladda upp nuvarande position?"
STR_UPLOAD_SUCCESS: "Framsteg uppladdade!"
STR_SYNC_FAILED_MSG: "Synkronisering misslyckades"
STR_SAVE_PROGRESS_FAILED: "Kunde inte spara framsteg"
STR_SECTION_PREFIX: "Sektion"
STR_UPLOAD: "Uppladdning"
STR_BOOK_S_STYLE: "Bokstil"
lib/I18n/translations/turkish.yaml
+1
View File
@@ -257,6 +257,7 @@ STR_NO_REMOTE_MSG: "Uzak ilerleme bulunamadı"
STR_UPLOAD_PROMPT: "Mevcut konumu yükle?"
STR_UPLOAD_SUCCESS: "İlerleme yüklendi!"
STR_SYNC_FAILED_MSG: "Senkronizasyon başarısız"
STR_SAVE_PROGRESS_FAILED: "İlerleme kaydedilemedi"
STR_SECTION_PREFIX: "Bölüm "
STR_UPLOAD: "Yükle"
STR_BOOK_S_STYLE: "Kitabın Stili"
lib/I18n/translations/ukrainian.yaml
+1
View File
@@ -287,6 +287,7 @@ STR_NO_REMOTE_MSG: "Віддаленого прогресу не знайден
STR_UPLOAD_PROMPT: "Завантажити поточну позицію?"
STR_UPLOAD_SUCCESS: "Прогрес завантажено!"
STR_SYNC_FAILED_MSG: "Синхронізація не вдалася"
STR_SAVE_PROGRESS_FAILED: "Не вдалося зберегти прогрес"
STR_SECTION_PREFIX: "Розділ "
STR_UPLOAD: "Завантажити"
STR_BOOK_S_STYLE: "Стиль книги"