A cross platform Audiobookshelf client for Android and iOS
Dart
Fix blank CarPlay when opening
Barnabasd950d4b9df65
diff --git a/lib/services/android_auto_service.dart b/lib/services/android_auto_service.dartindex f0ef084b..10fea34a 100644--- a/lib/services/android_auto_service.dart+++ b/lib/services/android_auto_service.dart@@ -1,5 +1,6 @@import 'dart:async';import 'dart:convert';+import 'dart:io' show Platform;import 'package:audio_service/audio_service.dart';import 'package:flutter/foundation.dart';@@ -197,7 +198,7 @@ class AndroidAutoService {_lastRefresh = null;_downloadsReady = false;_isRefreshing = false;- debugPrint('[AndroidAuto] Cache cleared (user switch/logout)');+ debugPrint('[AutoBrowse] Cache cleared (user switch/logout)');}// ── API helpers ──@@ -228,9 +229,9 @@ class AndroidAutoService {/// this populates Continue and Library tabs in the background.void _backgroundRefresh() {refresh().then((_) {- debugPrint('[AndroidAuto] Background refresh completed');+ debugPrint('[AutoBrowse] Background refresh completed');}).catchError((e) {- debugPrint('[AndroidAuto] Background refresh failed: $e');+ debugPrint('[AutoBrowse] Background refresh failed: $e');});}@@ -250,14 +251,14 @@ class AndroidAutoService {}_isRefreshing = true;- debugPrint('[AndroidAuto] Refreshing browse tree...');+ debugPrint('[AutoBrowse] Refreshing browse tree...');// Server fetch is best-effort — don't block the browse treetry {await _refreshDownloaded(); // re-fetch in case downloads changedawait _refreshFromServer();_lastRefresh = DateTime.now();- debugPrint('[AndroidAuto] Refresh done: '+ debugPrint('[AutoBrowse] Refresh done: ''${_continueListening.length} continue, ''${_downloaded.length} downloaded, ''${_libraries.length} libraries '@@ -266,14 +267,17 @@ class AndroidAutoService {} catch (e) {// Server unreachable — downloads are still available._lastRefresh = DateTime.now();- debugPrint('[AndroidAuto] Server refresh failed (downloads still available): $e');+ debugPrint('[AutoBrowse] Server refresh failed (downloads still available): $e');} finally {_isRefreshing = false;- // Tell the head unit to re-fetch the root browse tree now that data has changed.- try {- // ignore: deprecated_member_use- await AudioServiceBackground.notifyChildrenChanged(AutoMediaIds.root);- } catch (_) {}+ // Tell Android Auto's MediaBrowser to re-fetch the root browse tree.+ // iOS CarPlay uses this service for data but doesn't have a MediaBrowser.+ if (Platform.isAndroid) {+ try {+ // ignore: deprecated_member_use+ await AudioServiceBackground.notifyChildrenChanged(AutoMediaIds.root);+ } catch (_) {}+ }}}@@ -329,7 +333,7 @@ class AndroidAutoService {episodeId: episodeId,showId: showId,));- debugPrint('[AndroidAuto] Download entry: ${dl.title} cover=$coverUrl');+ debugPrint('[AutoBrowse] Download entry: ${dl.title} cover=$coverUrl');}_downloaded = entries;@@ -402,7 +406,7 @@ class AndroidAutoService {// Server unreachable — clear stale tabs so only Downloads shows offline_continueListening = [];_libraries = [];- debugPrint('[AndroidAuto] Server fetch error: $e');+ debugPrint('[AutoBrowse] Server fetch error: $e');}}@@ -569,7 +573,7 @@ class AndroidAutoService {try {await _refreshFromServer();} catch (e) {- debugPrint('[AndroidAuto] On-demand continue fetch failed: $e');+ debugPrint('[AutoBrowse] On-demand continue fetch failed: $e');}}return _continueListening.map((e) => e.toMediaItem()).toList();@@ -587,7 +591,7 @@ class AndroidAutoService {try {await _refreshFromServer();} catch (e) {- debugPrint('[AndroidAuto] On-demand library fetch failed: $e');+ debugPrint('[AutoBrowse] On-demand library fetch failed: $e');}}// If only one library, skip picker → go straight to its contents@@ -688,14 +692,14 @@ class AndroidAutoService {}if (allBooks.length > maxItems) {- debugPrint('[AndroidAuto] Trimmed books from ${allBooks.length} to $maxItems (Binder limit)');+ debugPrint('[AutoBrowse] Trimmed books from ${allBooks.length} to $maxItems (Binder limit)');return allBooks.sublist(0, maxItems);}- debugPrint('[AndroidAuto] Fetched ${allBooks.length} books');+ debugPrint('[AutoBrowse] Fetched ${allBooks.length} books');return allBooks;} catch (e) {- debugPrint('[AndroidAuto] Error fetching library books: $e');+ debugPrint('[AutoBrowse] Error fetching library books: $e');}return [];}@@ -734,10 +738,10 @@ class AndroidAutoService {page++;}- debugPrint('[AndroidAuto] Fetched ${allSeries.length} series');+ debugPrint('[AutoBrowse] Fetched ${allSeries.length} series');return allSeries;} catch (e) {- debugPrint('[AndroidAuto] Error fetching series: $e');+ debugPrint('[AutoBrowse] Error fetching series: $e');}return [];}@@ -763,11 +767,11 @@ class AndroidAutoService {}).whereType<MediaItem>().toList();items.sort((a, b) => a.title.toLowerCase().compareTo(b.title.toLowerCase()));- debugPrint('[AndroidAuto] Fetched ${items.length} authors');+ debugPrint('[AutoBrowse] Fetched ${items.length} authors');return items;}} catch (e) {- debugPrint('[AndroidAuto] Error fetching authors: $e');+ debugPrint('[AutoBrowse] Error fetching authors: $e');}return [];}@@ -785,7 +789,7 @@ class AndroidAutoService {.map((e) => e.toMediaItem()).toList();} catch (e) {- debugPrint('[AndroidAuto] Error fetching series books: $e');+ debugPrint('[AutoBrowse] Error fetching series books: $e');return [];}}@@ -803,7 +807,7 @@ class AndroidAutoService {.map((e) => e.toMediaItem()).toList();} catch (e) {- debugPrint('[AndroidAuto] Error fetching author books: $e');+ debugPrint('[AutoBrowse] Error fetching author books: $e');return [];}}@@ -854,10 +858,10 @@ class AndroidAutoService {return allShows.sublist(0, maxItems);}- debugPrint('[AndroidAuto] Fetched ${allShows.length} podcast shows');+ debugPrint('[AutoBrowse] Fetched ${allShows.length} podcast shows');return allShows;} catch (e) {- debugPrint('[AndroidAuto] Error fetching podcast shows: $e');+ debugPrint('[AutoBrowse] Error fetching podcast shows: $e');}return [];}@@ -906,10 +910,10 @@ class AndroidAutoService {));}- debugPrint('[AndroidAuto] Fetched ${items.length} episodes for "$showTitle"');+ debugPrint('[AutoBrowse] Fetched ${items.length} episodes for "$showTitle"');return items;} catch (e) {- debugPrint('[AndroidAuto] Error fetching show episodes: $e');+ debugPrint('[AutoBrowse] Error fetching show episodes: $e');}return [];}@@ -947,7 +951,7 @@ class AndroidAutoService {}return allEntries.length > maxItems ? allEntries.sublist(0, maxItems) : allEntries;} catch (e) {- debugPrint('[AndroidAuto] Error fetching library books data: $e');+ debugPrint('[AutoBrowse] Error fetching library books data: $e');return [];}}@@ -978,7 +982,7 @@ class AndroidAutoService {}return allSeries;} catch (e) {- debugPrint('[AndroidAuto] Error fetching series data: $e');+ debugPrint('[AutoBrowse] Error fetching series data: $e');return [];}}@@ -1001,7 +1005,7 @@ class AndroidAutoService {return items;}} catch (e) {- debugPrint('[AndroidAuto] Error fetching authors data: $e');+ debugPrint('[AutoBrowse] Error fetching authors data: $e');}return [];}@@ -1018,7 +1022,7 @@ class AndroidAutoService {.whereType<AutoBookEntry>().toList();} catch (e) {- debugPrint('[AndroidAuto] Error fetching series books data: $e');+ debugPrint('[AutoBrowse] Error fetching series books data: $e');return [];}}@@ -1035,7 +1039,7 @@ class AndroidAutoService {.whereType<AutoBookEntry>().toList();} catch (e) {- debugPrint('[AndroidAuto] Error fetching author books data: $e');+ debugPrint('[AutoBrowse] Error fetching author books data: $e');return [];}}@@ -1071,7 +1075,7 @@ class AndroidAutoService {}return allShows.length > maxItems ? allShows.sublist(0, maxItems) : allShows;} catch (e) {- debugPrint('[AndroidAuto] Error fetching podcast shows data: $e');+ debugPrint('[AutoBrowse] Error fetching podcast shows data: $e');return [];}}@@ -1111,7 +1115,7 @@ class AndroidAutoService {}return entries;} catch (e) {- debugPrint('[AndroidAuto] Error fetching show episodes data: $e');+ debugPrint('[AutoBrowse] Error fetching show episodes data: $e');return [];}}@@ -1164,7 +1168,7 @@ class AndroidAutoService {}return items;} catch (e) {- debugPrint('[AndroidAuto] Search error: $e');+ debugPrint('[AutoBrowse] Search error: $e');return [];}}diff --git a/lib/services/carplay_service.dart b/lib/services/carplay_service.dartindex 3a700adb..3b9d8af1 100644--- a/lib/services/carplay_service.dart+++ b/lib/services/carplay_service.dart@@ -16,6 +16,8 @@ class CarPlayService {final _autoService = AndroidAutoService();final _flutterCarplay = FlutterCarplay();bool _initialized = false;+ bool _buildingRoot = false;+ DateTime? _lastRootBuilt;void init() {if (!Platform.isIOS || _initialized) return;@@ -30,9 +32,20 @@ class CarPlayService {void _onConnectionChange(ConnectionStatusTypes status) {debugPrint('[CarPlay] Connection status: $status');- if (status == ConnectionStatusTypes.connected) {- _buildRootTemplate();+ if (status != ConnectionStatusTypes.connected) return;++ // iOS often fires `connected` twice in quick succession. Without this+ // guard, two concurrent _buildRootTemplate() calls race: the second one's+ // refresh() early-returns because the first holds _isRefreshing, so it+ // builds tabs from half-loaded data and calls setRootTemplate first —+ // which flutter_carplay then keeps as the rendered template.+ final now = DateTime.now();+ if (_buildingRoot) return;+ if (_lastRootBuilt != null &&+ now.difference(_lastRootBuilt!) < const Duration(seconds: 1)) {+ return;}+ _buildRootTemplate();}/// Clear cache and rebuild templates (e.g. on account switch).@@ -51,19 +64,27 @@ class CarPlayService {// ─── Root template ──────────────────────────────────────────────────Future<void> _buildRootTemplate() async {- // Ensure data is populated- await _autoService.refresh();-- final continueTab = await _buildContinueTab();- final libraryTab = await _buildLibraryTab();- final downloadsTab = await _buildDownloadsTab();-- FlutterCarplay.setRootTemplate(- rootTemplate: CPTabBarTemplate(- templates: [continueTab, libraryTab, downloadsTab],- ),- );- debugPrint('[CarPlay] Root template set');+ _buildingRoot = true;+ try {+ // Force refresh so we fully await the server fetch before building tabs.+ // Without `force`, a concurrent refresh in progress (or a recent one)+ // causes this call to early-return, producing tabs with stale/empty data.+ await _autoService.refresh(force: true);++ final continueTab = await _buildContinueTab();+ final libraryTab = await _buildLibraryTab();+ final downloadsTab = await _buildDownloadsTab();++ FlutterCarplay.setRootTemplate(+ rootTemplate: CPTabBarTemplate(+ templates: [continueTab, libraryTab, downloadsTab],+ ),+ );+ _lastRootBuilt = DateTime.now();+ debugPrint('[CarPlay] Root template set');+ } finally {+ _buildingRoot = false;+ }}// ─── Continue Listening tab ─────────────────────────────────────────