Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Stop losing ebook pages read offline and include highlights and reader settings in backups

Barnabasbb6b53ea12c2
diff --git a/lib/services/api_service.dart b/lib/services/api_service.dart
index 30be5ea5..c3f65440 100644
--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@@ -1097,9 +1097,10 @@ class ApiService {
}
}
- /// Update ebook reading progress on the server.
+ /// Update ebook reading progress on the server. Returns whether the PATCH
+ /// landed, so the caller can queue the position for a later retry.
/// PATCH /api/me/progress/:id
- Future<void> updateEbookProgress(
+ Future<bool> updateEbookProgress(
String itemId, {
required String ebookLocation,
required double ebookProgress,
@@ -1124,8 +1125,10 @@ class ApiService {
body: body,
).timeout(const Duration(seconds: 10));
debugPrint('[API] updateEbookProgress response: ${resp.statusCode} ${resp.body}');
+ return resp.statusCode >= 200 && resp.statusCode < 300;
} catch (e) {
debugPrint('[API] updateEbookProgress error: $e');
+ return false;
}
}
diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dart
index 147ace89..84afcc81 100644
--- a/lib/services/backup_service.dart
+++ b/lib/services/backup_service.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'audio_player_service.dart';
+import 'reader_font_service.dart';
import 'scoped_prefs.dart';
import 'sleep_timer_service.dart';
import 'user_account_service.dart';
@@ -198,6 +199,7 @@ class BackupService {
final pendingOfflineListening = await ScopedPrefs.getStringList('pending_offline_listening');
final bookmarksPendingCreates = await ScopedPrefs.getString('bookmarks_pending_creates');
final bookmarksPendingDeletes = await ScopedPrefs.getString('bookmarks_pending_deletes');
+ final pendingEbookProgress = await ScopedPrefs.getString('pending_ebook_progress');
// Offline listening accumulators (scoped) - keyed by itemId
final offlineListening = <String, int>{};
@@ -244,6 +246,31 @@ class BackupService {
if (value != null && value.isNotEmpty) metadataOverrides[itemId] = value;
}
+ // Ebook annotations (scoped, keyed by itemId). Highlights, bookmarks and
+ // their notes live only on-device (ABS has no ebook annotation API), so
+ // the backup is their only way to survive a reinstall.
+ final ebookAnnotations = <String, String>{};
+ final annotPrefix = '${scopePrefix}ebook_annotations_';
+ for (final key in prefs.getKeys()) {
+ if (!key.startsWith(annotPrefix)) continue;
+ final itemId = key.substring(annotPrefix.length);
+ final value = prefs.getString(key);
+ if (value != null && value.isNotEmpty) ebookAnnotations[itemId] = value;
+ }
+
+ // E-reader appearance + behavior (scoped)
+ final ereader = <String, dynamic>{
+ 'fontSize': await ScopedPrefs.getInt('ereader_fontSize'),
+ 'lineHeight': await ScopedPrefs.getDouble('ereader_lineHeight'),
+ 'marginH': await ScopedPrefs.getInt('ereader_margin_h'),
+ 'marginV': await ScopedPrefs.getInt('ereader_margin_v'),
+ 'spread': await ScopedPrefs.getInt('ereader_spread'),
+ 'theme': await ScopedPrefs.getString('ereader_theme'),
+ 'font': await ScopedPrefs.getString('ereader_font'),
+ 'volumeNav': await PlayerSettings.getEreaderVolumeNav(),
+ 'volumeNavWhilePlaying': await PlayerSettings.getEreaderVolumeNavWhilePlaying(),
+ };
+
// Per-podcast UI prefs (GLOBAL, not scoped - keyed by itemId)
final podcastPrefs = <String, Map<String, dynamic>>{};
void collectPodcast(String prefix, String bucket, Object? Function(String) read) {
@@ -298,10 +325,13 @@ class BackupService {
'pendingOfflineListening': pendingOfflineListening,
'bookmarksPendingCreates': bookmarksPendingCreates,
'bookmarksPendingDeletes': bookmarksPendingDeletes,
+ 'pendingEbookProgress': pendingEbookProgress,
'offlineListening': offlineListening,
'rmab': rmab,
'homeLayouts': homeLayouts,
'metadataOverrides': metadataOverrides,
+ 'ebookAnnotations': ebookAnnotations,
+ 'ereader': ereader,
'podcastPrefs': podcastPrefs,
'customDownloadPath': customDownloadPath,
'accounts': accounts,
@@ -585,6 +615,8 @@ class BackupService {
if (bmpc != null) await ScopedPrefs.setString('bookmarks_pending_creates', bmpc);
final bmpd = data['bookmarksPendingDeletes'] as String?;
if (bmpd != null) await ScopedPrefs.setString('bookmarks_pending_deletes', bmpd);
+ final pep = data['pendingEbookProgress'] as String?;
+ if (pep != null) await ScopedPrefs.setString('pending_ebook_progress', pep);
// Offline listening accumulators (scoped, per-item) - write through SharedPreferences
// directly because ScopedPrefs doesn't expose setInt with scope handling here.
@@ -631,6 +663,35 @@ class BackupService {
}
}
+ // Ebook annotations (scoped, keyed by itemId)
+ final ebookAnnotations = data['ebookAnnotations'] as Map<String, dynamic>?;
+ if (ebookAnnotations != null) {
+ for (final entry in ebookAnnotations.entries) {
+ await ScopedPrefs.setString('ebook_annotations_${entry.key}', entry.value as String);
+ }
+ }
+
+ // E-reader appearance + behavior (scoped)
+ final er = data['ereader'] as Map<String, dynamic>?;
+ if (er != null) {
+ if (er['fontSize'] != null) await ScopedPrefs.setInt('ereader_fontSize', er['fontSize'] as int);
+ if (er['lineHeight'] != null) await ScopedPrefs.setDouble('ereader_lineHeight', (er['lineHeight'] as num).toDouble());
+ if (er['marginH'] != null) await ScopedPrefs.setInt('ereader_margin_h', er['marginH'] as int);
+ if (er['marginV'] != null) await ScopedPrefs.setInt('ereader_margin_v', er['marginV'] as int);
+ if (er['spread'] != null) await ScopedPrefs.setInt('ereader_spread', er['spread'] as int);
+ if (er['theme'] != null) await ScopedPrefs.setString('ereader_theme', er['theme'] as String);
+ if (er['font'] != null) {
+ final fontId = er['font'] as String;
+ await ScopedPrefs.setString('ereader_font', fontId);
+ // The woff2 files aren't in the backup - re-fetch the selected font
+ // so the restored choice actually renders.
+ final font = readerFontById(fontId);
+ if (font != null && font.downloadable) ReaderFontService().download(font);
+ }
+ if (er['volumeNav'] != null) await PlayerSettings.setEreaderVolumeNav(er['volumeNav'] as String);
+ if (er['volumeNavWhilePlaying'] != null) await PlayerSettings.setEreaderVolumeNavWhilePlaying(er['volumeNavWhilePlaying'] as bool);
+ }
+
// Per-podcast UI prefs (GLOBAL, not scoped)
final podcastPrefs = data['podcastPrefs'] as Map<String, dynamic>?;
if (podcastPrefs != null) {
diff --git a/lib/services/ebook_cache.dart b/lib/services/ebook_cache.dart
index 55741ce3..a01348e8 100644
--- a/lib/services/ebook_cache.dart
+++ b/lib/services/ebook_cache.dart
@@ -5,11 +5,16 @@ import 'package:path_provider/path_provider.dart';
import 'api_service.dart';
/// File extension (with leading dot) for an ABS ebookFile, or '' if unknown.
+/// Prefers the explicit `ebookFormat` field over the filename extension so a
+/// mis-named file can't be treated as the wrong format downstream (foliate-js
+/// tells CBZ and EPUB apart purely by the served filename).
String ebookExtFromFile(Map<String, dynamic> ebookFile) {
+ final fmt = (ebookFile['ebookFormat'] as String?)?.toLowerCase();
+ if (fmt != null && fmt.isNotEmpty) return '.$fmt';
final name = (ebookFile['metadata'] as Map<String, dynamic>?)?['filename'] as String?
?? ebookFile['name'] as String?
?? '';
- return name.contains('.') ? name.substring(name.lastIndexOf('.')) : '';
+ return name.contains('.') ? name.substring(name.lastIndexOf('.')).toLowerCase() : '';
}
Future<Directory> _ebookCacheDir() async {
diff --git a/lib/services/progress_sync_service.dart b/lib/services/progress_sync_service.dart
index 3f556a95..680c4c0b 100644
--- a/lib/services/progress_sync_service.dart
+++ b/lib/services/progress_sync_service.dart
@@ -319,9 +319,11 @@ class ProgressSyncService {
}
}
}
- // Also flush offline listening time while we have a connection
+ // Also flush offline listening time and queued ebook positions while
+ // we have a connection
if (_consecutiveFailures == 0) {
await _flushOfflineListeningTimeInternal(api: api);
+ await _flushPendingEbookProgress(api);
}
} finally {
_isFlushing = false;
@@ -329,7 +331,8 @@ class ProgressSyncService {
final remaining = await ScopedPrefs.getStringList('pending_syncs');
final pendingOffline = await ScopedPrefs.getStringList('pending_offline_listening');
- if ((_flushAgain || remaining.isNotEmpty || pendingOffline.isNotEmpty) && _isOnline) {
+ final pendingEbook = await getPendingEbookProgress();
+ if ((_flushAgain || remaining.isNotEmpty || pendingOffline.isNotEmpty || pendingEbook.isNotEmpty) && _isOnline) {
_flushAgain = false;
// Exponential backoff: 5s, 10s, 20s, 40s, ... capped at 5 minutes
@@ -350,6 +353,77 @@ class ProgressSyncService {
}
}
+ // ── Ebook reading progress (durable offline queue) ──
+
+ /// Push an ebook position to the server. A failed PATCH is persisted
+ /// (newest position per item) and retried by flushPendingSync when
+ /// connectivity returns, so pages read offline survive an app restart.
+ Future<void> pushEbookProgress(
+ ApiService api,
+ String itemId, {
+ required String location,
+ required double progress,
+ }) async {
+ final ok = _isOnline &&
+ await api.updateEbookProgress(itemId,
+ ebookLocation: location, ebookProgress: progress);
+ if (ok) {
+ await _removePendingEbook(itemId);
+ return;
+ }
+ final pending = await getPendingEbookProgress();
+ pending[itemId] = {
+ 'loc': location,
+ 'prog': progress,
+ 'ts': DateTime.now().millisecondsSinceEpoch,
+ };
+ await ScopedPrefs.setString('pending_ebook_progress', jsonEncode(pending));
+ debugPrint('[Sync] Queued ebook progress for $itemId (offline or PATCH failed)');
+ }
+
+ /// Queued ebook positions whose PATCH hasn't landed yet
+ /// (itemId -> {loc, prog, ts}).
+ Future<Map<String, Map<String, dynamic>>> getPendingEbookProgress() async {
+ final raw = await ScopedPrefs.getString('pending_ebook_progress');
+ if (raw == null || raw.isEmpty) return {};
+ try {
+ final map = jsonDecode(raw) as Map<String, dynamic>;
+ return map.map((k, v) => MapEntry(k, Map<String, dynamic>.from(v as Map)));
+ } catch (_) {
+ return {};
+ }
+ }
+
+ Future<void> _removePendingEbook(String itemId) async {
+ final pending = await getPendingEbookProgress();
+ if (pending.remove(itemId) == null) return;
+ await ScopedPrefs.setString('pending_ebook_progress', jsonEncode(pending));
+ }
+
+ Future<void> _flushPendingEbookProgress(ApiService api) async {
+ final pending = await getPendingEbookProgress();
+ if (pending.isEmpty) return;
+ debugPrint('[Sync] Flushing ${pending.length} pending ebook positions');
+ for (final entry in pending.entries) {
+ final loc = entry.value['loc'] as String?;
+ final prog = (entry.value['prog'] as num?)?.toDouble();
+ if (loc == null || prog == null) {
+ await _removePendingEbook(entry.key);
+ continue;
+ }
+ final ok = await api.updateEbookProgress(entry.key,
+ ebookLocation: loc, ebookProgress: prog);
+ if (ok) {
+ await _removePendingEbook(entry.key);
+ _consecutiveFailures = 0;
+ } else {
+ // Server unreachable - let the existing backoff schedule the retry.
+ _consecutiveFailures++;
+ break;
+ }
+ }
+ }
+
// ── Offline listening time tracking ──
/// Add listening time for an item that was played offline.
diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dart
index 1d86b7a9..5141ccd9 100644
--- a/lib/widgets/absorbing_card.dart
+++ b/lib/widgets/absorbing_card.dart
@@ -82,12 +82,8 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
Map<String, dynamic>? get _ebookFile =>
(_media['ebookFile'] as Map<String, dynamic>?) ?? _fetchedEbookFile;
String? get _ebookExt {
- final ebookFile = _ebookFile;
- if (ebookFile == null) return null;
- final fn = (ebookFile['metadata'] as Map<String, dynamic>?)?['filename'] as String?
- ?? ebookFile['name'] as String?;
- if (fn == null || !fn.contains('.')) return null;
- return fn.substring(fn.lastIndexOf('.') + 1).toLowerCase();
+ final ext = ebookExt(_ebookFile);
+ return ext.isEmpty ? null : ext;
}
List<dynamic> get _chapters {
// Prefer fetched chapters (from full item or episode), fall back to inline data
diff --git a/lib/widgets/ebook_reader_view.dart b/lib/widgets/ebook_reader_view.dart
index d22356f6..2557e3a8 100644
--- a/lib/widgets/ebook_reader_view.dart
+++ b/lib/widgets/ebook_reader_view.dart
@@ -12,6 +12,7 @@ import '../providers/library_provider.dart';
import '../services/audio_player_service.dart';
import '../services/ebook_annotation_service.dart';
import '../services/ebook_cache.dart';
+import '../services/progress_sync_service.dart';
import '../services/reader_font_service.dart';
import '../services/scoped_prefs.dart';
import '../services/volume_key_service.dart';
@@ -111,6 +112,11 @@ class EbookReaderViewState extends State<EbookReaderView> with WidgetsBindingObs
// per mount, or it re-triggers itself into an endless display->displayed loop
// that freezes page-turn taps. Reset whenever the viewer remounts.
bool _didLoadRescue = false;
+ // Same event, same reason: the handler/highlight/font wiring must run once
+ // per mount, not on every chapter crossing - unguarded it stacked a new JS
+ // relocated-listener, re-registered every highlight and re-shipped the
+ // ~100KB font payload each time a chapter boundary was crossed.
+ bool _didInitViewer = false;
// Reader settings
int _fontSize = 16;
@@ -159,7 +165,11 @@ class EbookReaderViewState extends State<EbookReaderView> with WidgetsBindingObs
WidgetsBinding.instance.addObserver(this);
_epubController = EpubController();
_loadInitialLocation();
- _loadSettings().then((_) => _downloadAndOpen());
+ // A settings read failure must not stop the book from opening - fall back
+ // to the field defaults and open anyway.
+ _loadSettings()
+ .catchError((e) => debugPrint('[EbookReader] settings load failed: $e'))
+ .whenComplete(_downloadAndOpen);
// Fullscreen is toggled once the open transition completes (see _onRouteAnim
// / didChangeDependencies), not here: hiding the system bars mid-transition
// forces a full relayout while the busy home screen is still compositing
@@ -369,6 +379,7 @@ class EbookReaderViewState extends State<EbookReaderView> with WidgetsBindingObs
_locationsReady = false;
_viewerKey++; // force the viewer to remount with the new spread
_didLoadRescue = false; // let the remounted viewer rescue its first paint
+ _didInitViewer = false; // fresh JS context needs its wiring again
});
await ScopedPrefs.setInt(_kSpread, index);
}
@@ -607,10 +618,11 @@ class EbookReaderViewState extends State<EbookReaderView> with WidgetsBindingObs
final auth = context.read<AuthProvider>();
final api = auth.apiService;
if (api == null) return;
- api.updateEbookProgress(
+ ProgressSyncService().pushEbookProgress(
+ api,
widget.itemId,
- ebookLocation: cfi,
- ebookProgress: progress,
+ location: cfi,
+ progress: progress,
);
context.read<LibraryProvider>().applyLocalEbookProgress(
widget.itemId, location: cfi, progress: progress);
@@ -1957,11 +1969,14 @@ class EbookReaderViewState extends State<EbookReaderView> with WidgetsBindingObs
debugPrint('[EbookReader] onEpubLoaded item=${widget.itemId} '
'rescue=${once != null && once.isNotEmpty ? "cfi" : "start"}');
}
- _loadAnnotations().then((_) => _restoreHighlights());
- _setupPageInfoHandler();
- _setupTapHandler();
- _setupFontInjector();
- _applyFontFace();
+ if (!_didInitViewer) {
+ _didInitViewer = true;
+ _loadAnnotations().then((_) => _restoreHighlights());
+ _setupPageInfoHandler();
+ _setupTapHandler();
+ _setupFontInjector();
+ _applyFontFace();
+ }
},
onRelocated: (value) {
if (!mounted) return;
diff --git a/lib/widgets/ebook_router.dart b/lib/widgets/ebook_router.dart
index 6dad1a1f..4744768a 100644
--- a/lib/widgets/ebook_router.dart
+++ b/lib/widgets/ebook_router.dart
@@ -1,20 +1,18 @@
import 'package:flutter/material.dart';
import '../l10n/app_localizations.dart';
+import '../services/ebook_cache.dart';
import 'ebook_reader_view.dart';
import 'pdf_reader_view.dart';
import 'foliate_reader_view.dart';
import 'overlay_toast.dart';
-/// Lower-cased ebook format for an ABS ebookFile - prefers the explicit
-/// `ebookFormat` field, falls back to the filename extension.
+/// Lower-cased ebook format (no dot) for an ABS ebookFile. Shares the cache's
+/// format-first derivation so the router, cache and readers can never disagree
+/// on what a file is.
String ebookExt(Map<String, dynamic>? ebookFile) {
if (ebookFile == null) return '';
- final fmt = (ebookFile['ebookFormat'] as String?)?.toLowerCase();
- if (fmt != null && fmt.isNotEmpty) return fmt;
- final fn = (ebookFile['metadata'] as Map<String, dynamic>?)?['filename'] as String?
- ?? ebookFile['name'] as String?;
- if (fn == null || !fn.contains('.')) return '';
- return fn.substring(fn.lastIndexOf('.') + 1).toLowerCase();
+ final ext = ebookExtFromFile(ebookFile);
+ return ext.startsWith('.') ? ext.substring(1) : ext;
}
/// Formats the in-app reader can open. EPUB uses the full reader, PDF the
diff --git a/lib/widgets/expanded_card.dart b/lib/widgets/expanded_card.dart
index af9b8649..099afa75 100644
--- a/lib/widgets/expanded_card.dart
+++ b/lib/widgets/expanded_card.dart
@@ -1165,12 +1165,8 @@ class _ExpandedCardState extends State<ExpandedCard> {
Map<String, dynamic>? get _ebookFile =>
(_media['ebookFile'] as Map<String, dynamic>?) ?? _fetchedEbookFile;
String? get _ebookExt {
- final ef = _ebookFile;
- if (ef == null) return null;
- final fn = (ef['metadata'] as Map<String, dynamic>?)?['filename'] as String?
- ?? ef['name'] as String?;
- if (fn == null || !fn.contains('.')) return null;
- return fn.substring(fn.lastIndexOf('.') + 1).toLowerCase();
+ final ext = ebookExt(_ebookFile);
+ return ext.isEmpty ? null : ext;
}
void _openReader() {
diff --git a/lib/widgets/foliate_reader_view.dart b/lib/widgets/foliate_reader_view.dart
index f8a4427c..c4f9b711 100644
--- a/lib/widgets/foliate_reader_view.dart
+++ b/lib/widgets/foliate_reader_view.dart
@@ -9,6 +9,7 @@ import '../providers/library_provider.dart';
import '../services/api_service.dart';
import '../services/audio_player_service.dart';
import '../services/ebook_cache.dart';
+import '../services/progress_sync_service.dart';
import '../services/foliate_book_server.dart';
import '../services/volume_key_service.dart';
@@ -49,7 +50,7 @@ class FoliateReaderView extends StatefulWidget {
State<FoliateReaderView> createState() => _FoliateReaderViewState();
}
-class _FoliateReaderViewState extends State<FoliateReaderView> {
+class _FoliateReaderViewState extends State<FoliateReaderView> with WidgetsBindingObserver {
final _server = FoliateBookServer();
InAppWebViewController? _controller;
ApiService? _api;
@@ -84,6 +85,7 @@ class _FoliateReaderViewState extends State<FoliateReaderView> {
@override
void initState() {
super.initState();
+ WidgetsBinding.instance.addObserver(this);
_setFullscreen(true);
_api = context.read<AuthProvider>().apiService;
_lib = context.read<LibraryProvider>();
@@ -92,6 +94,12 @@ class _FoliateReaderViewState extends State<FoliateReaderView> {
_volumeNav.attach();
}
+ // Flush on background so an OS kill can't lose the last pages read.
+ @override
+ void didChangeAppLifecycleState(AppLifecycleState state) {
+ if (state == AppLifecycleState.paused) _flushProgress();
+ }
+
late final EreaderVolumeNav _volumeNav = EreaderVolumeNav(
onPrev: () => _controller?.evaluateJavascript(source: 'window.AbsorbReader.prev();'),
onNext: () => _controller?.evaluateJavascript(source: 'window.AbsorbReader.next();'),
@@ -99,6 +107,7 @@ class _FoliateReaderViewState extends State<FoliateReaderView> {
@override
void dispose() {
+ WidgetsBinding.instance.removeObserver(this);
_volumeNav.detach();
_setFullscreen(false);
_flushProgress();
@@ -128,12 +137,7 @@ class _FoliateReaderViewState extends State<FoliateReaderView> {
if (p != null) _progress = p.clamp(0.0, 1.0);
}
- String get _ext {
- final name = (widget.ebookFile['metadata'] as Map<String, dynamic>?)?['filename'] as String?
- ?? widget.ebookFile['name'] as String?
- ?? '';
- return name.contains('.') ? name.substring(name.lastIndexOf('.')).toLowerCase() : '';
- }
+ String get _ext => ebookExtFromFile(widget.ebookFile);
String _mimeFor(String ext) {
switch (ext) {
@@ -264,7 +268,7 @@ class _FoliateReaderViewState extends State<FoliateReaderView> {
final api = _api;
final cfi = _cfi;
if (api == null || cfi == null || cfi == _lastSyncedCfi) return;
- api.updateEbookProgress(widget.itemId, ebookLocation: cfi, ebookProgress: _progress);
+ ProgressSyncService().pushEbookProgress(api, widget.itemId, location: cfi, progress: _progress);
_lib?.applyLocalEbookProgress(widget.itemId, location: cfi, progress: _progress);
_lastSync = DateTime.now();
_lastSyncedCfi = cfi;
diff --git a/lib/widgets/pdf_reader_view.dart b/lib/widgets/pdf_reader_view.dart
index f9ff922c..c752a43b 100644
--- a/lib/widgets/pdf_reader_view.dart
+++ b/lib/widgets/pdf_reader_view.dart
@@ -8,6 +8,7 @@ import '../providers/auth_provider.dart';
import '../providers/library_provider.dart';
import '../services/api_service.dart';
import '../services/ebook_cache.dart';
+import '../services/progress_sync_service.dart';
import '../services/volume_key_service.dart';
/// Full-screen PDF reader. PDFs are fixed-layout, so this is deliberately
@@ -30,7 +31,7 @@ class PdfReaderView extends StatefulWidget {
State<PdfReaderView> createState() => _PdfReaderViewState();
}
-class _PdfReaderViewState extends State<PdfReaderView> {
+class _PdfReaderViewState extends State<PdfReaderView> with WidgetsBindingObserver {
final _controller = PdfViewerController();
ApiService? _api;
LibraryProvider? _lib;
@@ -52,6 +53,7 @@ class _PdfReaderViewState extends State<PdfReaderView> {
@override
void initState() {
super.initState();
+ WidgetsBinding.instance.addObserver(this);
_setFullscreen(true);
_api = context.read<AuthProvider>().apiService;
_lib = context.read<LibraryProvider>();
@@ -60,6 +62,12 @@ class _PdfReaderViewState extends State<PdfReaderView> {
_volumeNav.attach();
}
+ // Flush on background so an OS kill can't lose the last pages read.
+ @override
+ void didChangeAppLifecycleState(AppLifecycleState state) {
+ if (state == AppLifecycleState.paused) _flushProgress();
+ }
+
late final EreaderVolumeNav _volumeNav = EreaderVolumeNav(
onPrev: () {
if (_page > 1) _controller.goToPage(pageNumber: _page - 1);
@@ -73,6 +81,7 @@ class _PdfReaderViewState extends State<PdfReaderView> {
@override
void dispose() {
+ WidgetsBinding.instance.removeObserver(this);
_volumeNav.detach();
_setFullscreen(false);
_flushProgress();
@@ -126,7 +135,7 @@ class _PdfReaderViewState extends State<PdfReaderView> {
final api = _api;
if (page == null || api == null || _pageCount <= 0 || page == _lastSyncedPage) return;
final frac = (page / _pageCount).clamp(0.0, 1.0);
- api.updateEbookProgress(widget.itemId, ebookLocation: '$page', ebookProgress: frac);
+ ProgressSyncService().pushEbookProgress(api, widget.itemId, location: '$page', progress: frac);
_lib?.applyLocalEbookProgress(widget.itemId, location: '$page', progress: frac);
_lastSync = DateTime.now();
_lastSyncedPage = page;