A cross platform Audiobookshelf client for Android and iOS
Dart
Add an option to start playback when Android Auto connects
Barnabas462ff03adcb0
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex 9d818ee9..6c2df2cb 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -4114,6 +4114,9 @@"androidAutoTabContinue": "Continue","androidAutoTabLibrary": "Library","androidAutoTabDownloads": "Downloads",+ "carConnectAutoplay": "Start playback when Android Auto connects",+ "carConnectAutoplayOnSubtitle": "The last book you were listening to starts by itself when the car connects",+ "carConnectAutoplayOffSubtitle": "Playback waits for you to press play","androidAutoCatBooks": "Books","androidAutoCatSeries": "Series","androidAutoCatAuthors": "Authors",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 1ba842ec..e885dcc2 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -11781,6 +11781,24 @@ abstract class AppLocalizations {/// **'Downloads'**String get androidAutoTabDownloads;+ /// No description provided for @carConnectAutoplay.+ ///+ /// In en, this message translates to:+ /// **'Start playback when Android Auto connects'**+ String get carConnectAutoplay;++ /// No description provided for @carConnectAutoplayOnSubtitle.+ ///+ /// In en, this message translates to:+ /// **'The last book you were listening to starts by itself when the car connects'**+ String get carConnectAutoplayOnSubtitle;++ /// No description provided for @carConnectAutoplayOffSubtitle.+ ///+ /// In en, this message translates to:+ /// **'Playback waits for you to press play'**+ String get carConnectAutoplayOffSubtitle;+/// No description provided for @androidAutoCatBooks.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 4447e451..64899c94 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -6975,6 +6975,17 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Bücher';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex 649a4703..07887982 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -6883,6 +6883,17 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 773623b9..8885e40e 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -6883,6 +6883,17 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex 52726d77..d8e32d93 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -6885,6 +6885,17 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex bf4b9fba..b16be6b2 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -6930,6 +6930,17 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Téléchargements';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Livres';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex 84d2b197..4de4c95f 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -6883,6 +6883,17 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 8edbf306..8640fa03 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -6883,6 +6883,17 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex 08f60d1b..e110286b 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -6883,6 +6883,17 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex 75008d5c..1e75759c 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -6883,6 +6883,17 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex 2efebc54..8b2594bd 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -6883,6 +6883,17 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex cd12e5ec..e256cf10 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -6887,6 +6887,17 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex cd565865..80fac1b2 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -6793,6 +6793,17 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get androidAutoTabDownloads => 'Downloads';+ @override+ String get carConnectAutoplay => 'Start playback when Android Auto connects';++ @override+ String get carConnectAutoplayOnSubtitle =>+ 'The last book you were listening to starts by itself when the car connects';++ @override+ String get carConnectAutoplayOffSubtitle =>+ 'Playback waits for you to press play';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex b2621316..efbcac95 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -89,6 +89,7 @@ class _SettingsScreenState extends State<SettingsScreen> {bool _notifChapterProgress = false;bool _notifSpeedBookmark = false;bool _duckBriefInterruptions = false;+ bool _autoplayOnCarConnect = false;bool _lockSeekBar = false;bool _mp3IndexSeeking = false;bool _speedAdjustedTime = true;@@ -1011,6 +1012,7 @@ class _SettingsScreenState extends State<SettingsScreen> {final podcastTabLibraryId = await PlayerSettings.getPodcastTabLibraryId();final episodeNotifMinutes = await PlayerSettings.getEpisodeNotifIntervalMinutes();final duckBriefInterruptions = await PlayerSettings.getDuckBriefInterruptions();+ final autoplayOnCarConnect = await PlayerSettings.getAutoplayOnCarConnect();if (mounted) setState(() {_podcastTabEnabled = podcastTabEnabled;_podcastTabLibraryId = podcastTabLibraryId;@@ -1030,6 +1032,7 @@ class _SettingsScreenState extends State<SettingsScreen> {_notifChapterProgress = notifChapter;_notifSpeedBookmark = notifSpeedBookmark;_duckBriefInterruptions = duckBriefInterruptions;+ _autoplayOnCarConnect = autoplayOnCarConnect;_lockSeekBar = lockSeek;_speedAdjustedTime = speedAdj;_forwardSkip = fwd;@@ -2854,6 +2857,20 @@ class _SettingsScreenState extends State<SettingsScreen> {} : null,),const Divider(height: 1, indent: 16, endIndent: 16),+ SwitchListTile(+ title: Text(l.carConnectAutoplay),+ subtitle: Text(+ _autoplayOnCarConnect+ ? l.carConnectAutoplayOnSubtitle+ : l.carConnectAutoplayOffSubtitle,+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),+ value: _autoplayOnCarConnect,+ onChanged: _loaded ? (v) {+ setState(() => _autoplayOnCarConnect = v);+ PlayerSettings.setAutoplayOnCarConnect(v);+ } : null,+ ),+ const Divider(height: 1, indent: 16, endIndent: 16),SwitchListTile(title: Text(l.speedBookmarkInControls),subtitle: Text(diff --git a/lib/services/audio_player_service.dart b/lib/services/audio_player_service.dartindex b8b934d2..93d04046 100644--- a/lib/services/audio_player_service.dart+++ b/lib/services/audio_player_service.dart@@ -1023,11 +1023,51 @@ class AudioPlayerHandler extends BaseAudioHandler with SeekHandler {Map<String, dynamic>? options,]) async {debugPrint('[Handler] getChildren($parentMediaId)');+ if (Platform.isAndroid) unawaited(_maybeAutoplayOnCarConnect());// Don't await refresh() here — getChildrenOf() handles it:// downloads are populated instantly, server data loads in background.return _autoService.getChildrenOf(parentMediaId);}+ DateTime? _lastCarBrowseSeen;++ /// GH #371: opt-in autoplay when Android Auto connects with nothing loaded.+ ///+ /// A browse request alone isn't a car - Bluetooth stereos browse over AVRCP+ /// too - so this trusts the Java-side gearhead stamp, and only a stamp a few+ /// seconds old counts as "the car just connected". A book already loaded+ /// means the session is alive and Android Auto's own resume setting owns the+ /// warm case (and it keeps a deliberate mid-drive pause from being undone by+ /// a later browse). Browses during the same drive keep refreshing+ /// [_lastCarBrowseSeen], so only a fresh stamp after a quiet gap fires.+ Future<void> _maybeAutoplayOnCarConnect() async {+ try {+ final service = _service;+ if (service == null) return;+ final snap = await _absorbDiagSnapshot();+ final age = snap?['carClientAgeMs'];+ final carFresh = age is int && age >= 0 && age < 15000;+ if (!carFresh) return;+ final now = DateTime.now();+ final last = _lastCarBrowseSeen;+ _lastCarBrowseSeen = now;+ final isNewConnection =+ last == null || now.difference(last) > const Duration(minutes: 5);+ if (!isNewConnection) return;+ if (service.hasBook) return;+ if (!await PlayerSettings.getAutoplayOnCarConnect()) return;+ // Let the browse tree and session setup settle before starting audio.+ await Future.delayed(const Duration(milliseconds: 1500));+ if (service.hasBook || service.isPlaying) return;+ final restore = AudioPlayerService.onColdStartPlayRequested;+ if (restore == null) return;+ debugPrint('[AutoPlay] Android Auto connected - resuming last played');+ await restore();+ } catch (e) {+ debugPrint('[AutoPlay] car-connect autoplay failed: $e');+ }+ }+@overrideFuture<MediaItem?> getMediaItem(String mediaId) async {debugPrint('[Handler] getMediaItem($mediaId)');diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dartindex bb95a894..df2af972 100644--- a/lib/services/player_settings.dart+++ b/lib/services/player_settings.dart@@ -748,6 +748,14 @@ class PlayerSettings {static Future<void> setDuckBriefInterruptions(bool value) =>_set('duckBriefInterruptions', value, notify: true);+ // Android only (GH #371): start the last played book when Android Auto+ // connects and nothing is loaded yet. The warm case (session alive but+ // paused) is Android Auto's own "automatically resume media" setting; this+ // covers the cold start where no session exists for it to resume.+ static Future<bool> getAutoplayOnCarConnect() => _get('autoplayOnCarConnect', false);+ static Future<void> setAutoplayOnCarConnect(bool value) =>+ _set('autoplayOnCarConnect', value);+// When true, the system media scrubber still shows progress but can't be// dragged to seek - stops accidental position jumps from the notification,// lockscreen, Android Auto and CarPlay. Implemented by dropping the seek