A cross platform Audiobookshelf client for Android and iOS
Dart
Marking a book finished while offline now syncs once you're back online
Barnabas25a970d242c4
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex 50a5a15b..e6416865 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -846,6 +846,10 @@"currentLibrarySkipOverride": "Custom skip amounts","currentLibrarySkipOverrideOnSubtitle": "On - this library uses its own skip amounts","currentLibrarySkipOverrideOffSubtitle": "Off - this library uses the global skip amounts",+ "currentLibrarySpeedOverride": "Custom default speed",+ "currentLibrarySpeedOverrideOnSubtitle": "On - new items in this library start at their own speed",+ "currentLibrarySpeedOverrideOffSubtitle": "Off - new items in this library start at the global default speed",+ "currentLibrarySpeed": "Default speed","currentLibrarySkipBack": "Skip back","currentLibrarySkipForward": "Skip forward","chapterProgressInNotification": "Chapter progress in notification & Android Auto",@@ -2259,6 +2263,7 @@"markAsFullyAbsorbedContent": "This will set your progress to 100% and stop playback if this book is playing.","markedAsFinishedNiceWork": "Marked as finished - nice work!","failedToUpdateCheckConnection": "Failed to update - check your connection",+ "markedFinishedWillSync": "Marked as finished - will sync when you're back online","markAsNotFinishedQuestion": "Mark as Not Finished?","markAsNotFinishedContent": "This will clear the finished status and put your position back at the start.","unmark": "Unmark",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex fb59afec..fdf21e34 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -3292,6 +3292,30 @@ abstract class AppLocalizations {/// **'Off - this library uses the global skip amounts'**String get currentLibrarySkipOverrideOffSubtitle;+ /// No description provided for @currentLibrarySpeedOverride.+ ///+ /// In en, this message translates to:+ /// **'Custom default speed'**+ String get currentLibrarySpeedOverride;++ /// No description provided for @currentLibrarySpeedOverrideOnSubtitle.+ ///+ /// In en, this message translates to:+ /// **'On - new items in this library start at their own speed'**+ String get currentLibrarySpeedOverrideOnSubtitle;++ /// No description provided for @currentLibrarySpeedOverrideOffSubtitle.+ ///+ /// In en, this message translates to:+ /// **'Off - new items in this library start at the global default speed'**+ String get currentLibrarySpeedOverrideOffSubtitle;++ /// No description provided for @currentLibrarySpeed.+ ///+ /// In en, this message translates to:+ /// **'Default speed'**+ String get currentLibrarySpeed;+/// No description provided for @currentLibrarySkipBack.////// In en, this message translates to:@@ -7672,6 +7696,12 @@ abstract class AppLocalizations {/// **'Failed to update - check your connection'**String get failedToUpdateCheckConnection;+ /// No description provided for @markedFinishedWillSync.+ ///+ /// In en, this message translates to:+ /// **'Marked as finished - will sync when you\'re back online'**+ String get markedFinishedWillSync;+/// No description provided for @markAsNotFinishedQuestion.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 59f4c8be..0cddc67a 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -1787,6 +1787,20 @@ class AppLocalizationsDe extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Aus - diese Bibliothek verwendet die globalen Überspringen-längen';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Zurückspringen';@@ -4390,6 +4404,10 @@ class AppLocalizationsDe extends AppLocalizations {String get failedToUpdateCheckConnection =>'Aktualisieren fehlgeschlagen - prüfe deine Verbindung';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Als nicht beendet markieren?';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex a7aeb3e6..801b7d4d 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -1768,6 +1768,20 @@ class AppLocalizationsEl extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Off - this library uses the global skip amounts';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Skip back';@@ -4343,6 +4357,10 @@ class AppLocalizationsEl extends AppLocalizations {String get failedToUpdateCheckConnection =>'Failed to update - check your connection';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Mark as Not Finished?';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 5370e08f..819284f9 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -1768,6 +1768,20 @@ class AppLocalizationsEn extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Off - this library uses the global skip amounts';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Skip back';@@ -4343,6 +4357,10 @@ class AppLocalizationsEn extends AppLocalizations {String get failedToUpdateCheckConnection =>'Failed to update - check your connection';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Mark as Not Finished?';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex b4c1934d..111f67bf 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -1770,6 +1770,20 @@ class AppLocalizationsEs extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Off - this library uses the global skip amounts';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Skip back';@@ -4345,6 +4359,10 @@ class AppLocalizationsEs extends AppLocalizations {String get failedToUpdateCheckConnection =>'Failed to update - check your connection';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Mark as Not Finished?';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex bcf240fe..801b6d30 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -1792,6 +1792,20 @@ class AppLocalizationsFr extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Désactivé - cette bibliothèque utilise les longueurs de saut globales';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Reculer';@@ -4394,6 +4408,10 @@ class AppLocalizationsFr extends AppLocalizations {String get failedToUpdateCheckConnection =>'Failed to update - check your connection';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Mark as Not Finished?';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex 93b152ef..b6f15e50 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -1768,6 +1768,20 @@ class AppLocalizationsIt extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Off - this library uses the global skip amounts';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Skip back';@@ -4343,6 +4357,10 @@ class AppLocalizationsIt extends AppLocalizations {String get failedToUpdateCheckConnection =>'Failed to update - check your connection';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Mark as Not Finished?';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex f7f94347..9e465556 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -1768,6 +1768,20 @@ class AppLocalizationsJa extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Off - this library uses the global skip amounts';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Skip back';@@ -4343,6 +4357,10 @@ class AppLocalizationsJa extends AppLocalizations {String get failedToUpdateCheckConnection =>'Failed to update - check your connection';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Mark as Not Finished?';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex 5d6b28b8..1d273770 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -1768,6 +1768,20 @@ class AppLocalizationsNo extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Off - this library uses the global skip amounts';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Skip back';@@ -4343,6 +4357,10 @@ class AppLocalizationsNo extends AppLocalizations {String get failedToUpdateCheckConnection =>'Failed to update - check your connection';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Mark as Not Finished?';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex c608dc02..93488b2d 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -1768,6 +1768,20 @@ class AppLocalizationsPt extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Off - this library uses the global skip amounts';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Skip back';@@ -4343,6 +4357,10 @@ class AppLocalizationsPt extends AppLocalizations {String get failedToUpdateCheckConnection =>'Failed to update - check your connection';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Mark as Not Finished?';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex e548b0aa..8b4a1a36 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -1768,6 +1768,20 @@ class AppLocalizationsRo extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Off - this library uses the global skip amounts';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Skip back';@@ -4343,6 +4357,10 @@ class AppLocalizationsRo extends AppLocalizations {String get failedToUpdateCheckConnection =>'Failed to update - check your connection';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Mark as Not Finished?';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex 4165c1f6..69378af6 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -1770,6 +1770,20 @@ class AppLocalizationsRu extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Off - this library uses the global skip amounts';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Skip back';@@ -4347,6 +4361,10 @@ class AppLocalizationsRu extends AppLocalizations {String get failedToUpdateCheckConnection =>'Failed to update - check your connection';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => 'Mark as Not Finished?';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 1bf075f2..78fe617b 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -1743,6 +1743,20 @@ class AppLocalizationsZh extends AppLocalizations {String get currentLibrarySkipOverrideOffSubtitle =>'Off - this library uses the global skip amounts';+ @override+ String get currentLibrarySpeedOverride => 'Custom default speed';++ @override+ String get currentLibrarySpeedOverrideOnSubtitle =>+ 'On - new items in this library start at their own speed';++ @override+ String get currentLibrarySpeedOverrideOffSubtitle =>+ 'Off - new items in this library start at the global default speed';++ @override+ String get currentLibrarySpeed => 'Default speed';+@overrideString get currentLibrarySkipBack => 'Skip back';@@ -4280,6 +4294,10 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get failedToUpdateCheckConnection => '更新失败 - 请检查您的网络连接';+ @override+ String get markedFinishedWillSync =>+ 'Marked as finished - will sync when you\'re back online';+@overrideString get markAsNotFinishedQuestion => '标记为未完成?';diff --git a/lib/services/progress_sync_service.dart b/lib/services/progress_sync_service.dartindex 0ecfe219..bf3509b1 100644--- a/lib/services/progress_sync_service.dart+++ b/lib/services/progress_sync_service.dart@@ -79,6 +79,20 @@ class ProgressSyncService {}}+ /// Keep a finish the server could not be told about (a work firewall, say)+ /// so the next flush delivers it.+ Future<void> saveFinishedOffline(String itemId, double duration) async {+ final existing = await getLocal(itemId);+ debugPrint('[Sync] Finished $itemId offline - queued for the next sync');+ await saveLocal(+ itemId: itemId,+ currentTime: duration,+ duration: duration,+ speed: (existing?['speed'] as num?)?.toDouble() ?? 1.0,+ isFinished: true,+ );+ }+/// Cache server-known progress locally without marking it as a pending sync./// Skips items with a pending sync so unsynced local writes (e.g. a finished/// state saved while offline) are not clobbered by a stale server snapshot.diff --git a/lib/widgets/book_detail_sheet.dart b/lib/widgets/book_detail_sheet.dartindex bcaa4184..8522293d 100644--- a/lib/widgets/book_detail_sheet.dart+++ b/lib/widgets/book_detail_sheet.dart@@ -3876,8 +3876,9 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {}}} catch (_) {+ await ProgressSyncService().saveFinishedOffline(widget.itemId, duration);if (context.mounted) {- showOverlayToast(context, l.failedToUpdateCheckConnection, icon: Icons.error_outline_rounded);+ showOverlayToast(context, l.markedFinishedWillSync, icon: Icons.cloud_off_rounded);}}}diff --git a/lib/widgets/episode_detail_sheet.dart b/lib/widgets/episode_detail_sheet.dartindex 64ea8f00..55e360ff 100644--- a/lib/widgets/episode_detail_sheet.dart+++ b/lib/widgets/episode_detail_sheet.dart@@ -279,12 +279,13 @@ class _EpisodeDetailSheetState extends State<EpisodeDetailSheet> {);if (confirmed != true) return;// Mark finished — update server then local state for instant UI- await api.updateEpisodeProgress(+ final pushed = await api.updateEpisodeProgress(_itemId, _episodeId,currentTime: _duration,duration: _duration,isFinished: true,);+ if (!pushed) await ProgressSyncService().saveFinishedOffline(key, _duration);lib.markFinishedLocally(key, skipAutoAdvance: true);if (mounted) {showOverlayToast(diff --git a/lib/widgets/episode_list_sheet.dart b/lib/widgets/episode_list_sheet.dartindex 99e03828..091383f1 100644--- a/lib/widgets/episode_list_sheet.dart+++ b/lib/widgets/episode_list_sheet.dart@@ -14,6 +14,7 @@ import '../services/wording.dart';import '../providers/library_provider.dart';import '../services/audio_player_service.dart';import '../services/download_service.dart';+import '../services/progress_sync_service.dart';import '../services/chromecast_service.dart';import '../providers/auth_provider.dart';import '../screens/admin_podcasts_screen.dart';@@ -438,12 +439,13 @@ class _EpisodeListSheetState extends State<EpisodeListSheet> {final key = '$_itemId-$epId';if (finished) {- await api.updateEpisodeProgress(+ final pushed = await api.updateEpisodeProgress(_itemId, epId,currentTime: duration,duration: duration,isFinished: true,);+ if (!pushed) await ProgressSyncService().saveFinishedOffline(key, duration);lib.markFinishedLocally(key, skipAutoAdvance: true);} else {final progressData = lib.getEpisodeProgressData(_itemId, epId);diff --git a/lib/widgets/playlist_detail_sheet.dart b/lib/widgets/playlist_detail_sheet.dartindex ac19e894..1fe422bd 100644--- a/lib/widgets/playlist_detail_sheet.dart+++ b/lib/widgets/playlist_detail_sheet.dart@@ -2,6 +2,7 @@ import 'dart:async';import 'dart:io';import 'package:flutter/material.dart';import '../services/player_settings.dart';+import '../services/progress_sync_service.dart';import 'package:flutter/services.dart';import 'package:provider/provider.dart';import 'overlay_toast.dart';@@ -153,8 +154,11 @@ class _PlaylistDetailSheetState extends State<PlaylistDetailSheet> {if (episodeId != null) {if (finished) {- await api.updateEpisodeProgress(libraryItemId, episodeId,+ final pushed = await api.updateEpisodeProgress(libraryItemId, episodeId,currentTime: duration, duration: duration, isFinished: true);+ if (!pushed) {+ await ProgressSyncService().saveFinishedOffline('$libraryItemId-$episodeId', duration);+ }lib.markFinishedLocally('$libraryItemId-$episodeId', skipAutoAdvance: true);} else {final pd = lib.getProgressData('$libraryItemId-$episodeId');@@ -165,7 +169,11 @@ class _PlaylistDetailSheetState extends State<PlaylistDetailSheet> {}} else {if (finished) {- await api.markFinished(libraryItemId, duration);+ try {+ await api.markFinished(libraryItemId, duration);+ } catch (_) {+ await ProgressSyncService().saveFinishedOffline(libraryItemId, duration);+ }lib.markFinishedLocally(libraryItemId, skipAutoAdvance: true);} else {final pd = lib.getProgressData(libraryItemId);