Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Stop CarPlay from loading when disconnected and fix malformed server URLs

Barnabas68511acf2afb
diff --git a/lib/providers/auth_provider.dart b/lib/providers/auth_provider.dart
index 22549d15..bd63a0e5 100644
--- a/lib/providers/auth_provider.dart
+++ b/lib/providers/auth_provider.dart
@@ -18,6 +18,7 @@ import '../services/wear_auth_service.dart';
import '../l10n/app_localizations.dart';
import '../main.dart' show rootNavigatorKey;
import '../widgets/overlay_toast.dart';
+import '../utils/server_url.dart';
class AuthProvider extends ChangeNotifier {
String? _accessToken;
@@ -269,7 +270,15 @@ class AuthProvider extends ChangeNotifier {
if (savedUrl != null && savedToken != null) {
// Always restore credentials so we can at least go offline
- _serverUrl = savedUrl;
+ final restoredUrl = normalizeServerUrl(savedUrl);
+ if (restoredUrl != savedUrl) {
+ await prefs.setString('server_url', restoredUrl);
+ if (savedUsername != null) {
+ await UserAccountService()
+ .updateAccountUrl(savedUrl, savedUsername, restoredUrl);
+ }
+ }
+ _serverUrl = restoredUrl;
_accessToken = savedToken;
_refreshToken = savedRefreshToken;
_isLegacyToken = savedRefreshToken == null;
@@ -312,7 +321,7 @@ class AuthProvider extends ChangeNotifier {
// path doesn't hold up app launch. The health-check timer will
// re-probe every 60s once we're past startup, so a transient
// false-offline self-corrects quickly.
- reachable = await ApiService.pingServer(savedUrl, customHeaders: _customHeaders)
+ reachable = await ApiService.pingServer(restoredUrl, customHeaders: _customHeaders)
.timeout(const Duration(seconds: 5), onTimeout: () => false);
debugPrint('[Auth] remote ping result: reachable=$reachable (${sw.elapsedMilliseconds}ms)');
}
@@ -451,14 +460,7 @@ class AuthProvider extends ChangeNotifier {
}) async {
_errorMessage = null;
- // Normalize server URL
- String url = serverUrl.trim();
- if (!url.startsWith('http://') && !url.startsWith('https://')) {
- url = 'http://$url';
- }
- if (url.endsWith('/')) {
- url = url.substring(0, url.length - 1);
- }
+ final url = normalizeServerUrl(serverUrl);
// Check server reachability
final reachable = await ApiService.pingServer(url, customHeaders: customHeaders);
@@ -577,13 +579,7 @@ class AuthProvider extends ChangeNotifier {
}) async {
_errorMessage = null;
- String url = serverUrl.trim();
- if (!url.startsWith('http://') && !url.startsWith('https://')) {
- url = 'http://$url';
- }
- if (url.endsWith('/')) {
- url = url.substring(0, url.length - 1);
- }
+ final url = normalizeServerUrl(serverUrl);
final reachable = await ApiService.pingServer(url, customHeaders: customHeaders);
if (!reachable) {
@@ -666,8 +662,7 @@ class AuthProvider extends ChangeNotifier {
}) async {
_errorMessage = null;
- String url = serverUrl.trim();
- if (url.endsWith('/')) url = url.substring(0, url.length - 1);
+ final url = normalizeServerUrl(serverUrl);
final user = result['user'] as Map<String, dynamic>?;
if (user == null) {
@@ -755,7 +750,11 @@ class AuthProvider extends ChangeNotifier {
/// Load local server settings from PlayerSettings.
Future<void> _loadLocalServerSettings() async {
_localServerEnabled = await PlayerSettings.getLocalServerEnabled();
- _localServerUrl = await PlayerSettings.getLocalServerUrl();
+ final savedUrl = await PlayerSettings.getLocalServerUrl();
+ _localServerUrl = normalizeServerUrl(savedUrl);
+ if (_localServerUrl != savedUrl) {
+ await PlayerSettings.setLocalServerUrl(_localServerUrl);
+ }
if (_localServerEnabled) {
debugPrint('[Auth] Local server config loaded: enabled=$_localServerEnabled, url=${_localServerUrl.isNotEmpty ? "(set)" : "(empty)"}');
}
@@ -835,10 +834,11 @@ class AuthProvider extends ChangeNotifier {
/// Update local server settings from the UI.
Future<void> setLocalServerConfig({required bool enabled, required String url}) async {
+ final normalizedUrl = normalizeServerUrl(url);
_localServerEnabled = enabled;
- _localServerUrl = url;
+ _localServerUrl = normalizedUrl;
await PlayerSettings.setLocalServerEnabled(enabled);
- await PlayerSettings.setLocalServerUrl(url);
+ await PlayerSettings.setLocalServerUrl(normalizedUrl);
if (!enabled) clearLocalOverride();
}
@@ -1051,15 +1051,8 @@ class AuthProvider extends ChangeNotifier {
/// next API call (and the [apiService] getter) uses the new address.
/// Returns true if the account was found and updated.
Future<bool> editServerUrl(SavedAccount account, String newServerUrl) async {
- // Normalize the same way login() does.
- String url = newServerUrl.trim();
+ final url = normalizeServerUrl(newServerUrl);
if (url.isEmpty) return false;
- if (!url.startsWith('http://') && !url.startsWith('https://')) {
- url = 'http://$url';
- }
- if (url.endsWith('/')) {
- url = url.substring(0, url.length - 1);
- }
if (url == account.serverUrl) return true; // nothing to change
final ok = await UserAccountService()
diff --git a/lib/services/api_service.dart b/lib/services/api_service.dart
index d27ae59e..0e5d209b 100644
--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@@ -5,6 +5,7 @@ import 'package:http/http.dart' as http;
import 'package:shared_preferences/shared_preferences.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'auth_tokens.dart';
+import '../utils/server_url.dart';
/// Outcome of a local-session upsert. [serverTooOld] flags a 404/501 (the
/// server predates /api/session/local) so the caller can fall back to the
@@ -173,8 +174,7 @@ class ApiService {
'Authorization': 'Bearer $_accessToken',
};
- String get _cleanBaseUrl =>
- baseUrl.endsWith('/') ? baseUrl.substring(0, baseUrl.length - 1) : baseUrl;
+ String get _cleanBaseUrl => normalizeServerUrl(baseUrl);
Future<http.Response> _get(Uri url, {Map<String, String>? headers}) {
return _httpClient?.get(url, headers: headers) ?? http.get(url, headers: headers);
diff --git a/lib/services/carplay_image_url.dart b/lib/services/carplay_image_url.dart
new file mode 100644
index 00000000..512cfd82
--- /dev/null
+++ b/lib/services/carplay_image_url.dart
@@ -0,0 +1,24 @@
+String? safeCarPlayImageUrl(String? value) {
+ if (value == null || value.isEmpty || RegExp(r'\s').hasMatch(value)) {
+ return null;
+ }
+
+ try {
+ final uri = Uri.tryParse(value);
+ if (uri == null) return null;
+
+ if (uri.scheme == 'file') {
+ return uri.pathSegments.isNotEmpty ? value : null;
+ }
+
+ if ((uri.scheme == 'http' || uri.scheme == 'https') &&
+ uri.host.isNotEmpty) {
+ uri.port;
+ return value;
+ }
+ } on FormatException {
+ return null;
+ }
+
+ return null;
+}
diff --git a/lib/services/carplay_service.dart b/lib/services/carplay_service.dart
index 30c17b19..1a56128f 100644
--- a/lib/services/carplay_service.dart
+++ b/lib/services/carplay_service.dart
@@ -6,6 +6,7 @@ import 'package:flutter_carplay/flutter_carplay.dart';
import 'android_auto_service.dart';
import 'api_service.dart';
import 'audio_player_service.dart';
+import 'carplay_image_url.dart';
/// Manages Apple CarPlay browse tree and playback integration.
/// Mirrors the Android Auto layout: 3 tabs (Continue, Library, Downloads)
@@ -27,7 +28,7 @@ class CarPlayService {
Timer? _bannerDismissTimer;
bool _initialized = false;
- bool _buildingRoot = false;
+ bool _connected = false;
DateTime? _lastRootBuilt;
CPTabBarTemplate? _rootTemplate;
Future<void>? _inFlightBuild;
@@ -47,7 +48,7 @@ class CarPlayService {
// this hook is how we know to swap the downloads-only tree for the
// full one (or the other way for offline → online recovery).
AndroidAutoService.onServerDataChanged = () {
- if (!_initialized || _rootTemplate == null) return;
+ if (!_initialized || !_connected || _rootTemplate == null) return;
// _connectAndRender awaits its own refresh() which fires this callback
// mid-flight; without this guard both paths call setRootTemplate within
// ~0ms and CarPlay renders the tabs blank until the user backgrounds
@@ -64,36 +65,21 @@ class CarPlayService {
debugPrint('[CarPlay] onServerDataChanged - rebuilding root template');
refreshTemplates();
};
- // Eagerly load auto browse data so the first CarPlay connect lands with
- // full content already cached. Without this, the user's first open would
- // either show empty Continue Listening / Library tabs or wait the full
- // server-fetch time before anything appeared.
- //
- // After the refresh, also set the root template proactively. On a true
- // cold start - where iOS launched the app because the user tapped
- // absorb in CarPlay - the `connected` event can fire before our
- // connection listener is registered, and we miss it. Result: no
- // template ever gets set and CarPlay sits blank until the user backs
- // out and back in (which re-fires connected). Setting eagerly here
- // means iOS always has a template waiting whenever its scene
- // presents. The connect-handler still fires its own set; the
- // in-flight guard in _setRootTemplate coalesces overlapping calls.
- _autoService.refresh().then((_) async {
- debugPrint('[CarPlay] Init refresh done'
- ' continue=${_autoService.continueListening.length}'
- ' downloads=${_autoService.downloaded.length}'
- ' libraries=${_autoService.libraries.length}');
- try {
- await _setRootTemplate(label: 'init-eager');
- } catch (e) {
- debugPrint('[CarPlay] Init eager template set failed: $e');
+ unawaited(_restoreConnectionState());
+ }
+
+ Future<void> _restoreConnectionState() async {
+ try {
+ if (await FlutterCarplay.isConnected && _initialized && !_connected) {
+ _onConnectionChange(ConnectionStatusTypes.connected);
}
- }).catchError((e) {
- debugPrint('[CarPlay] Init refresh failed: $e');
- });
+ } catch (e) {
+ debugPrint('[CarPlay] Connection state check failed: $e');
+ }
}
void dispose() {
+ _connected = false;
_flutterCarplay.removeListenerOnConnectionChange();
AudioPlayerService().removeListener(_onPlayerChanged);
_bannerDismissTimer?.cancel();
@@ -102,27 +88,22 @@ class CarPlayService {
void _onConnectionChange(ConnectionStatusTypes status) {
debugPrint('[CarPlay] Connection status: $status');
if (status == ConnectionStatusTypes.disconnected) {
+ _connected = false;
_rootTemplate = null;
_lastRootBuilt = null;
+ _bannerDismissTimer?.cancel();
+ _bannerShowing = false;
return;
}
if (status != ConnectionStatusTypes.connected) return;
-
- // Guard duplicate `connected` events that iOS fires in quick succession.
- final now = DateTime.now();
- if (_buildingRoot) return;
- if (_lastRootBuilt != null &&
- now.difference(_lastRootBuilt!) < const Duration(seconds: 1)) {
- return;
- }
-
+ if (_connected) return;
+ _connected = true;
_connectAndRender();
}
Future<void> _connectAndRender() async {
- // Make sure data is loaded before rendering. Init kicked off a refresh at
- // app start, so this usually returns instantly. On a cold connect right
- // after app launch we wait the full ~1s so the very first template the
+ if (!_connected) return;
+ // Make sure data is loaded before rendering so the first template the
// user sees has real content.
//
// We avoid calling setRootTemplate twice (once empty, once full) because
@@ -136,19 +117,21 @@ class CarPlayService {
} catch (e) {
debugPrint('[CarPlay] Pre-render refresh failed: $e');
}
+ if (!_connected) return;
await _setRootTemplate(label: 'on-connect');
}
/// Clear cache and rebuild templates (e.g. on account switch).
Future<void> clearAndRefresh() async {
- if (!_initialized) return;
+ if (!_initialized || !_connected) return;
await _autoService.refresh(force: true);
+ if (!_connected) return;
await _setRootTemplate(label: 'clear-and-refresh');
}
/// Refresh CarPlay templates (e.g. after download completes).
Future<void> refreshTemplates() async {
- if (!_initialized) return;
+ if (!_initialized || !_connected) return;
await _setRootTemplate(label: 'refresh-templates');
}
@@ -184,6 +167,7 @@ class CarPlayService {
}
Future<void> _setRootTemplate({String label = ''}) async {
+ if (!_connected) return;
// Coalesce concurrent calls. If a build is already in flight, await it
// instead of starting a second one - two setRootTemplate invocations
// racing within the same microtask leave CarPlay rendering blank tabs.
@@ -201,36 +185,30 @@ class CarPlayService {
}
Future<void> _doSetRootTemplate({required String label}) async {
- _buildingRoot = true;
- try {
- final tabs = await _buildTabs();
- final root = CPTabBarTemplate(templates: tabs);
- _rootTemplate = root;
- await FlutterCarplay.setRootTemplate(rootTemplate: root, animated: false);
- // Without this the native side may not register onPress callbacks on
- // the new list items, leaving taps stuck on an infinite spinner.
- await _flutterCarplay.forceUpdateRootTemplate();
- _lastRootBuilt = DateTime.now();
- debugPrint('[CarPlay] Root template set ($label)'
- ' continue=${_autoService.continueListening.length}'
- ' downloads=${_autoService.downloaded.length}'
- ' libraries=${_autoService.libraries.length}');
- // Configure the Now Playing buttons here too: on a cold CarPlay launch
- // the `connected` event can fire before our listener registers (see the
- // eager-init note above), but the root template always gets built, so
- // this is the reliable hook. Re-running it is idempotent.
- await _configureNowPlayingButtons();
- } finally {
- _buildingRoot = false;
- }
+ final tabs = await _buildTabs();
+ if (!_connected) return;
+ final root = CPTabBarTemplate(templates: tabs);
+ _rootTemplate = root;
+ await FlutterCarplay.setRootTemplate(rootTemplate: root, animated: false);
+ if (!_connected) return;
+ // Without this the native side may not register onPress callbacks on
+ // the new list items, leaving taps stuck on an infinite spinner.
+ await _flutterCarplay.forceUpdateRootTemplate();
+ _lastRootBuilt = DateTime.now();
+ debugPrint('[CarPlay] Root template set ($label)'
+ ' continue=${_autoService.continueListening.length}'
+ ' downloads=${_autoService.downloaded.length}'
+ ' libraries=${_autoService.libraries.length}');
+ // Configure the Now Playing buttons after the root template is built.
+ await _configureNowPlayingButtons();
}
// ─── Now Playing custom buttons ─────────────────────────────────────
/// Ask the native side to (re)attach the custom buttons to
- /// CPNowPlayingTemplate.shared. Safe to call when not connected — it just
- /// primes the shared template for the next time CarPlay presents it.
+ /// CPNowPlayingTemplate.shared.
Future<void> _configureNowPlayingButtons() async {
+ if (!_connected) return;
try {
final speed = AudioPlayerService().speed;
_lastPushedSpeed = speed;
@@ -241,13 +219,9 @@ class CarPlayService {
}
}
- /// Refresh the CarPlay speed button when the rate changes anywhere. No
- /// "connected" gate on purpose: on a cold CarPlay launch the connected event
- /// fires before our listener registers and is missed, so that flag can stay
- /// false the whole session and would freeze the badge at its initial value.
- /// The speed-diff check keeps this cheap; re-pushing while disconnected just
- /// primes the shared Now Playing template, which is harmless.
+ /// Refresh the CarPlay speed button when the rate changes anywhere.
void _onPlayerChanged() {
+ if (!_connected) return;
final speed = AudioPlayerService().speed;
if ((speed - _lastPushedSpeed).abs() < 0.001) return;
_configureNowPlayingButtons();
@@ -257,12 +231,14 @@ class CarPlayService {
/// auto-dismissing modal alert (the closest thing to a banner it offers). The
/// OK action lets the driver dismiss early; otherwise it clears itself.
Future<void> _showBookmarkBanner() async {
+ if (!_connected) return;
try {
_bannerDismissTimer?.cancel();
if (_bannerShowing) {
await FlutterCarplay.popModal();
_bannerShowing = false;
}
+ if (!_connected) return;
await FlutterCarplay.showAlert(
template: CPAlertTemplate(
titleVariants: const ['Bookmark added'],
@@ -272,7 +248,7 @@ class CarPlayService {
onPress: () {
_bannerDismissTimer?.cancel();
_bannerShowing = false;
- FlutterCarplay.popModal();
+ if (_connected) FlutterCarplay.popModal();
},
),
],
@@ -280,7 +256,7 @@ class CarPlayService {
);
_bannerShowing = true;
_bannerDismissTimer = Timer(const Duration(milliseconds: 1800), () {
- if (!_bannerShowing) return;
+ if (!_connected || !_bannerShowing) return;
_bannerShowing = false;
FlutterCarplay.popModal();
});
@@ -292,7 +268,7 @@ class CarPlayService {
/// Route a Now Playing button tap from native into the audio handler's
/// customAction, which owns the chapter/speed/bookmark logic.
Future<dynamic> _handleNativeCall(MethodCall call) async {
- if (call.method != 'carPlayButton') return null;
+ if (!_connected || call.method != 'carPlayButton') return null;
final action = (call.arguments as Map?)?['action'] as String?;
if (action == null) return null;
debugPrint('[CarPlay] Now Playing button: $action');
@@ -351,10 +327,10 @@ class CarPlayService {
onPress: (complete, self) async {
if (lib.isPodcast) {
final template = await _buildPodcastShowsList(lib.id, lib.name);
- FlutterCarplay.push(template: template);
+ _pushTemplate(template);
} else {
final template = await _buildBookSubCategories(lib.id, lib.name);
- FlutterCarplay.push(template: template);
+ _pushTemplate(template);
}
complete();
},
@@ -390,7 +366,7 @@ class CarPlayService {
accessoryType: CPListItemAccessoryTypes.disclosureIndicator,
onPress: (complete, self) async {
final template = await _buildBooksList(libraryId);
- FlutterCarplay.push(template: template);
+ _pushTemplate(template);
complete();
},
),
@@ -399,7 +375,7 @@ class CarPlayService {
accessoryType: CPListItemAccessoryTypes.disclosureIndicator,
onPress: (complete, self) async {
final template = await _buildSeriesList(libraryId);
- FlutterCarplay.push(template: template);
+ _pushTemplate(template);
complete();
},
),
@@ -408,7 +384,7 @@ class CarPlayService {
accessoryType: CPListItemAccessoryTypes.disclosureIndicator,
onPress: (complete, self) async {
final template = await _buildAuthorsList(libraryId);
- FlutterCarplay.push(template: template);
+ _pushTemplate(template);
complete();
},
),
@@ -450,7 +426,7 @@ class CarPlayService {
accessoryType: CPListItemAccessoryTypes.disclosureIndicator,
onPress: (complete, self) async {
final template = await _buildBooksLeaf(libraryId, b.prefix);
- FlutterCarplay.push(template: template);
+ _pushTemplate(template);
complete();
},
);
@@ -485,7 +461,7 @@ class CarPlayService {
accessoryType: CPListItemAccessoryTypes.disclosureIndicator,
onPress: (complete, self) async {
final template = await _buildSeriesBooks(s.id, libraryId, s.name);
- FlutterCarplay.push(template: template);
+ _pushTemplate(template);
complete();
},
);
@@ -519,7 +495,7 @@ class CarPlayService {
accessoryType: CPListItemAccessoryTypes.disclosureIndicator,
onPress: (complete, self) async {
final template = await _buildAuthorBooks(a.id, libraryId, a.name);
- FlutterCarplay.push(template: template);
+ _pushTemplate(template);
complete();
},
);
@@ -550,11 +526,11 @@ class CarPlayService {
final items = showsData.map((s) {
return CPListItem(
text: s.title,
- image: s.coverUrl,
+ image: safeCarPlayImageUrl(s.coverUrl),
accessoryType: CPListItemAccessoryTypes.disclosureIndicator,
onPress: (complete, self) async {
final template = await _buildShowEpisodes(s.id, libraryId, s.title);
- FlutterCarplay.push(template: template);
+ _pushTemplate(template);
complete();
},
);
@@ -589,9 +565,10 @@ class CarPlayService {
// Streaming: ?ts= the server updatedAt so iOS refetches after a cover change.
final entryUrl = entry.coverUrl;
final ts = AndroidAutoService.coverTsFor(coverItemId);
- final coverUrl = (entryUrl != null && entryUrl.startsWith('file://'))
+ final rawCoverUrl = (entryUrl != null && entryUrl.startsWith('file://'))
? entryUrl
: api?.getCoverUrl(coverItemId, updatedAt: ts);
+ final coverUrl = safeCarPlayImageUrl(rawCoverUrl);
final isPodcastShow = entry.mediaType == 'podcast' &&
entry.episodeId == null &&
@@ -607,7 +584,7 @@ class CarPlayService {
onPress: (complete, self) async {
final template = await _buildShowEpisodes(
entry.id, entry.libraryId!, entry.title);
- FlutterCarplay.push(template: template);
+ _pushTemplate(template);
complete();
},
);
@@ -634,6 +611,11 @@ class CarPlayService {
return (entry.currentTime! / entry.duration).clamp(0.0, 1.0);
}
+ void _pushTemplate(CPListTemplate template) {
+ if (!_connected) return;
+ FlutterCarplay.push(template: template);
+ }
+
void _playItem(String mediaId) {
debugPrint('[CarPlay] Playing: $mediaId');
// Call the handler directly. The static AudioService.playFromMediaId is a
@@ -643,6 +625,6 @@ class CarPlayService {
// Jump straight to Now Playing on tap, like the native apps, instead of
// making the user find the Now Playing button. pushIfNotExist on the native
// side means it's a no-op if Now Playing is already on screen.
- FlutterCarplay.showSharedNowPlaying();
+ if (_connected) FlutterCarplay.showSharedNowPlaying();
}
}
diff --git a/lib/utils/server_url.dart b/lib/utils/server_url.dart
new file mode 100644
index 00000000..8e311d48
--- /dev/null
+++ b/lib/utils/server_url.dart
@@ -0,0 +1,10 @@
+String normalizeServerUrl(String value) {
+ var url = value.trim().replaceAll(RegExp(r'\s+'), '');
+ if (url.isEmpty) return '';
+
+ if (!RegExp(r'^https?://', caseSensitive: false).hasMatch(url)) {
+ url = 'http://$url';
+ }
+
+ return url.replaceAll(RegExp(r'/+$'), '');
+}
diff --git a/packages/flutter_carplay/ios/Classes/FCPEnums.swift b/packages/flutter_carplay/ios/Classes/FCPEnums.swift
index 995ea4ab..46eee14c 100644
--- a/packages/flutter_carplay/ios/Classes/FCPEnums.swift
+++ b/packages/flutter_carplay/ios/Classes/FCPEnums.swift
@@ -33,6 +33,7 @@ enum FCPChannelTypes {
static let onTextButtonPressed = "onTextButtonPressed"
static let popToRootTemplate = "popToRootTemplate"
static let onScreenBackButtonPressed = "onScreenBackButtonPressed"
+ static let isConnected = "isConnected"
}
enum FCPAlertActionTypes {
diff --git a/packages/flutter_carplay/ios/Classes/FCPExtensions.swift b/packages/flutter_carplay/ios/Classes/FCPExtensions.swift
index d1936f06..5f39aaa7 100644
--- a/packages/flutter_carplay/ios/Classes/FCPExtensions.swift
+++ b/packages/flutter_carplay/ios/Classes/FCPExtensions.swift
@@ -17,11 +17,28 @@ enum ImageSource {
// String → ImageSource
extension String {
- func toImageSource() -> ImageSource {
- if self.starts(with: "http") {
- return .url(URL(string: self)!)
- } else if self.starts(with: "file://") {
- return .file(self.replacingOccurrences(of: "file://", with: ""))
+ func toImageSource() -> ImageSource? {
+ guard !self.isEmpty,
+ self.rangeOfCharacter(from: .whitespacesAndNewlines) == nil else {
+ return nil
+ }
+ let lowercased = self.lowercased()
+ if lowercased.starts(with: "http") {
+ guard let url = URL(string: self),
+ let scheme = url.scheme?.lowercased(),
+ (scheme == "http" || scheme == "https"),
+ let host = url.host,
+ !host.isEmpty else {
+ return nil
+ }
+ return .url(url)
+ } else if lowercased.starts(with: "file://") {
+ guard let url = URL(string: self), url.isFileURL, !url.path.isEmpty else {
+ return nil
+ }
+ return .file(url.path)
+ } else if self.contains("://") {
+ return nil
} else {
return .flutterAsset(self)
}
diff --git a/packages/flutter_carplay/ios/Classes/FlutterCarplayPluginSceneDelegate.swift b/packages/flutter_carplay/ios/Classes/FlutterCarplayPluginSceneDelegate.swift
index b65bc74f..165d9908 100644
--- a/packages/flutter_carplay/ios/Classes/FlutterCarplayPluginSceneDelegate.swift
+++ b/packages/flutter_carplay/ios/Classes/FlutterCarplayPluginSceneDelegate.swift
@@ -25,6 +25,10 @@ extension CPTemplate {
class FlutterCarPlaySceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate, CPInterfaceControllerDelegate {
static private var interfaceController: CPInterfaceController?
+ static var isConnected: Bool {
+ return interfaceController != nil
+ }
+
static public func forceUpdateRootTemplate() {
let rootTemplate = SwiftFlutterCarplayPlugin.rootTemplate
let animated = SwiftFlutterCarplayPlugin.animated
diff --git a/packages/flutter_carplay/ios/Classes/SwiftFlutterCarplayPlugin.swift b/packages/flutter_carplay/ios/Classes/SwiftFlutterCarplayPlugin.swift
index 949da42a..1b1b9b05 100644
--- a/packages/flutter_carplay/ios/Classes/SwiftFlutterCarplayPlugin.swift
+++ b/packages/flutter_carplay/ios/Classes/SwiftFlutterCarplayPlugin.swift
@@ -43,6 +43,9 @@ public class SwiftFlutterCarplayPlugin: NSObject, FlutterPlugin {
public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
switch call.method {
+ case FCPChannelTypes.isConnected:
+ result(FlutterCarPlaySceneDelegate.isConnected)
+ break
case FCPChannelTypes.setRootTemplate:
guard let args = call.arguments as? [String : Any] else {
result(false)
diff --git a/packages/flutter_carplay/ios/Classes/models/grid/FCPGridButton.swift b/packages/flutter_carplay/ios/Classes/models/grid/FCPGridButton.swift
index 0058c342..3e63a8f4 100644
--- a/packages/flutter_carplay/ios/Classes/models/grid/FCPGridButton.swift
+++ b/packages/flutter_carplay/ios/Classes/models/grid/FCPGridButton.swift
@@ -27,8 +27,10 @@ class FCPGridButton {
if #available(iOS 26.0, *) {
image = makeSafeUIPlaceholder()
- } else {
+ } else if let imageSource = imageSource {
image = makeUIImage(from: imageSource)
+ } else {
+ image = makeSafeUIPlaceholder()
}
gridButton = CPGridButton(
@@ -44,7 +46,7 @@ class FCPGridButton {
}
)
- if #available(iOS 26.0, *) {
+ if #available(iOS 26.0, *), let imageSource = imageSource {
loadUIImageAsync(from: imageSource) { uiImage in
if let uiImage = uiImage {
gridButton.perform(Selector("updateImage:"), with: uiImage)
diff --git a/packages/flutter_carplay/ios/Classes/models/list/FCPListItem.swift b/packages/flutter_carplay/ios/Classes/models/list/FCPListItem.swift
index a95ee377..70ebdb2e 100644
--- a/packages/flutter_carplay/ios/Classes/models/list/FCPListItem.swift
+++ b/packages/flutter_carplay/ios/Classes/models/list/FCPListItem.swift
@@ -51,9 +51,8 @@ class FCPListItem {
var get: CPListItem {
let listItem = CPListItem.init(text: text, detailText: detailText)
listItem.handler = self.handler
- if image != nil {
+ if let imageSource = image?.toImageSource() {
listItem.setImage(makeSafeUIPlaceholder())
- let imageSource = self.image!.toImageSource()
loadUIImageAsync(from: imageSource) { uiImage in
if let uiImage = uiImage {
listItem.setImage(uiImage)
@@ -95,12 +94,15 @@ class FCPListItem {
}
if let image = image, image != self.image {
- self._super?.setImage(makeSafeUIPlaceholder())
- let imageSource = image.toImageSource()
- loadUIImageAsync(from: imageSource) { uiImage in
- if let uiImage = uiImage {
- self._super?.setImage(uiImage)
+ if let imageSource = image.toImageSource() {
+ self._super?.setImage(makeSafeUIPlaceholder())
+ loadUIImageAsync(from: imageSource) { uiImage in
+ if let uiImage = uiImage {
+ self._super?.setImage(uiImage)
+ }
}
+ } else {
+ self._super?.setImage(nil)
}
self.image = image
} else if image == nil {
diff --git a/packages/flutter_carplay/lib/carplay_worker.dart b/packages/flutter_carplay/lib/carplay_worker.dart
index bbeac801..71f804cc 100644
--- a/packages/flutter_carplay/lib/carplay_worker.dart
+++ b/packages/flutter_carplay/lib/carplay_worker.dart
@@ -142,6 +142,15 @@ class FlutterCarplay {
return _connectionStatus;
}
+ /// Whether CarPlay currently has an active interface controller.
+ static Future<bool> get isConnected async {
+ return await _carPlayController.flutterToNativeModule(
+ FCPChannelTypes.isConnected,
+ null,
+ ) ??
+ false;
+ }
+
/// Sets the root template of the navigation hierarchy. If a navigation
/// hierarchy already exists, CarPlay replaces the entire hierarchy.
///
diff --git a/packages/flutter_carplay/lib/constants/private_constants.dart b/packages/flutter_carplay/lib/constants/private_constants.dart
index 5ce77fab..ddff1444 100644
--- a/packages/flutter_carplay/lib/constants/private_constants.dart
+++ b/packages/flutter_carplay/lib/constants/private_constants.dart
@@ -18,6 +18,7 @@ enum FCPChannelTypes {
onTextButtonPressed,
popToRootTemplate,
onScreenBackButtonPressed,
+ isConnected,
}
enum FAAChannelTypes {
diff --git a/packages/flutter_carplay/test/flutter_carplay_test.dart b/packages/flutter_carplay/test/flutter_carplay_test.dart
index cfe7c283..dac32e69 100644
--- a/packages/flutter_carplay/test/flutter_carplay_test.dart
+++ b/packages/flutter_carplay/test/flutter_carplay_test.dart
@@ -1,15 +1,33 @@
+import 'package:flutter_carplay/flutter_carplay.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
- const MethodChannel channel = MethodChannel('flutter_carplay');
+ const channel = MethodChannel('com.oguzhnatly.flutter_carplay');
TestWidgetsFlutterBinding.ensureInitialized();
- setUp(() {
+ tearDown(() {
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
- .setMockMethodCallHandler(channel, (MethodCall channel) async {
- return '42';
+ .setMockMethodCallHandler(channel, null);
+ });
+
+ test('reports the native CarPlay connection state', () async {
+ MethodCall? receivedCall;
+ TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+ .setMockMethodCallHandler(channel, (call) async {
+ receivedCall = call;
+ return true;
});
+
+ expect(await FlutterCarplay.isConnected, isTrue);
+ expect(receivedCall?.method, 'isConnected');
+ });
+
+ test('treats a missing native connection result as disconnected', () async {
+ TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+ .setMockMethodCallHandler(channel, (_) async => null);
+
+ expect(await FlutterCarplay.isConnected, isFalse);
});
}