A cross platform Audiobookshelf client for Android and iOS
Dart
Fix casting card not moving to front, fix offline sync pulling stale position #136
Nathan Poulsonf125a92dffe0
diff --git a/lib/screens/absorbing_screen.dart b/lib/screens/absorbing_screen.dartindex 8ac8465c..198108e7 100644--- a/lib/screens/absorbing_screen.dart+++ b/lib/screens/absorbing_screen.dart@@ -154,9 +154,22 @@ class _AbsorbingScreenState extends State<AbsorbingScreen> {// when it stops/disconnects, keep that card at front.final nowCasting = _cast.isCasting;if (nowCasting && !_wasCasting) {- // Casting just started — scroll to the cast card+ // Casting just started — move cast card to front, same as local playback_lastCastItemId = _cast.castingItemId;_lastCastEpisodeId = _cast.castingEpisodeId;+ final castKey = _lastCastEpisodeId != null+ ? '$_lastCastItemId-$_lastCastEpisodeId'+ : _lastCastItemId!;+ final lib = context.read<LibraryProvider>();+ lib.unblockFromAbsorbing(castKey);+ _lastFinishedId = castKey;+ ScopedPrefs.setString('absorbing_last_finished', castKey);+ final currentPage = _pageController.hasClients+ ? (_pageController.page ?? 0).round() : 0;+ _suppressReorder = currentPage > 0;+ if (!_suppressReorder) {+ lib.moveAbsorbingToFront(castKey);+ }WidgetsBinding.instance.addPostFrameCallback((_) => _scrollToActiveCard());} else if (nowCasting) {_lastCastItemId = _cast.castingItemId;@@ -392,7 +405,7 @@ class _AbsorbingScreenState extends State<AbsorbingScreen> {// When nothing is playing, keep the last-finished item at the front// Only if it matches the current library type- if (!_player.hasBook && _lastFinishedId != null && !removes.contains(_lastFinishedId)) {+ if (!_player.hasBook && !_cast.isCasting && _lastFinishedId != null && !removes.contains(_lastFinishedId)) {// Compound podcast keys are "uuid-uuid" (>36 chars); plain book UUIDs are 36.final finishedIsPodcast = _lastFinishedId!.length > 36;if (_mergeLibraries || finishedIsPodcast == isPod) {@@ -508,7 +521,10 @@ class _AbsorbingScreenState extends State<AbsorbingScreen> {child: Row(mainAxisSize: MainAxisSize.min,children: [- Icon(Icons.stop_rounded, size: 18, color: muted),+ if (_isSyncing)+ SizedBox(width: 18, height: 18, child: CircularProgressIndicator(strokeWidth: 1.5, color: muted))+ else+ Icon(Icons.stop_rounded, size: 18, color: muted),const SizedBox(width: 4),Text('Stop', style: TextStyle(color: muted, fontSize: 13, fontWeight: FontWeight.w500)),],diff --git a/lib/services/progress_sync_service.dart b/lib/services/progress_sync_service.dartindex 3e4dd544..b9829823 100644--- a/lib/services/progress_sync_service.dart+++ b/lib/services/progress_sync_service.dart@@ -209,7 +209,14 @@ class ProgressSyncService {final serverTimestamp = (serverProgress['lastUpdate'] as num?)?.toInt() ?? 0;final serverTime = (serverProgress['currentTime'] as num?)?.toDouble() ?? 0;- if (serverTimestamp > localTimestamp) {+ // Check if there's pending offline listening time for this item.+ // If so, the server doesn't have the full picture yet - always+ // push local to avoid overwriting progress with a stale position.+ final hasOfflineListening =+ (await ScopedPrefs.getInt('offline_listening_$itemId') ?? 0) > 0;++ if (serverTimestamp > localTimestamp &&+ (serverTime >= localTime || !hasOfflineListening)) {debugPrint('[Sync] Server is newer for $itemId: server=$serverTime s ($serverTimestamp) vs local=$localTime s ($localTimestamp) — pulling');await cacheServerProgress(itemId: itemId,