Alters the metadata sent to google cast to reflect the station rather the song when cast began.

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "chat.tools.terminal.autoApprove": {
-        "flutter": true
-    }
-}

android/app/src/main/kotlin/com/example/kryz_go_flutter/KryzAutoMediaBrowserService.kt

@@ -5,7 +5,6 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.ComponentName
 import android.content.Context
-import android.content.Intent
 import android.os.Handler
 import android.os.Looper
 import android.support.v4.media.MediaBrowserCompat
@@ -179,37 +178,11 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
 
     override fun onDestroy() {
         Log.d(TAG, "onDestroy()")
-        stopFlutterPlaybackForHeadUnitDisconnect()
         disconnectFromFlutterAudioService()
         if (::mediaSession.isInitialized) mediaSession.release()
         super.onDestroy()
     }
 
-    override fun onTaskRemoved(rootIntent: Intent?) {
-        Log.d(TAG, "onTaskRemoved()")
-        stopFlutterPlaybackForHeadUnitDisconnect()
-        super.onTaskRemoved(rootIntent)
-    }
-
-    override fun onUnbind(intent: Intent?): Boolean {
-        Log.d(TAG, "onUnbind()")
-        stopFlutterPlaybackForHeadUnitDisconnect()
-        return super.onUnbind(intent)
-    }
-
-    private fun stopFlutterPlaybackForHeadUnitDisconnect() {
-        pendingPlayRequest = false
-        pendingStopRequest = false
-
-        try {
-            audioServiceController?.transportControls?.stop()
-        } catch (error: Exception) {
-            Log.w(TAG, "Unable to stop Flutter audio on head unit disconnect: ${error.message}")
-        }
-
-        applyPlaybackState(isPlaying = false, isBuffering = false)
-    }
-
     private fun applyPlaybackState(isPlaying: Boolean, isBuffering: Boolean) {
         if (!::mediaSession.isInitialized) return
         val state = when {

android/app/src/main/kotlin/com/example/kryz_go_flutter/MainActivity.kt

@@ -27,26 +27,13 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 	companion object {
 		private const val METHOD_CHANNEL = "kryz_go_flutter/casting/methods"
 		private const val EVENT_CHANNEL = "kryz_go_flutter/casting/events"
-		private const val MAX_PENDING_CAST_AUTOPLAY_RETRIES = 5
-		private const val REMOTE_STATUS_POLL_INTERVAL_MS = 500L
 	}
 
-	private data class PendingCastRequest(
-		val streamUrl: String,
-		val title: String,
-		val subtitle: String,
-	)
-
 	private var castContext: CastContext? = null
-	private var methodChannel: MethodChannel? = null
 	private var eventSink: EventChannel.EventSink? = null
 	private var chooserDialog: MediaRouteChooserDialog? = null
 	private val mainHandler = Handler(Looper.getMainLooper())
     private var activeRemoteMediaClient: RemoteMediaClient? = null
-	private var pendingCastRequest: PendingCastRequest? = null
-	private var pendingCastRequestInFlight: Boolean = false
-	private var pendingCastAutoplayRetryCount: Int = 0
-	private var remoteCastStatusPollingRunnable: Runnable? = null
 
 	private var statusPayload: MutableMap<String, Any?> = mutableMapOf(
 		"status" to "idle",
@@ -71,13 +58,10 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 
 		override fun onSessionStarted(session: CastSession, sessionId: String) {
 			attachRemoteClientCallback(session)
-			startRemoteStatusPolling()
 			emitStatus("connected", session.castDevice?.friendlyName)
-			startPendingCastRequest(session)
 		}
 
 		override fun onSessionStartFailed(session: CastSession, error: Int) {
-			clearPendingCastRequest()
 			emitStatus("error", message = "Cast session failed to start ($error)")
 		}
 
@@ -87,10 +71,6 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 		}
 
 		override fun onSessionEnded(session: CastSession, error: Int) {
-			stopRemoteStatusPolling()
-			clearPendingCastRequest()
-			// If app was launched from Android Auto, restart audio service on cast disconnect
-			restartAudioServiceSession()
 			emitStatus("idle")
 		}
 
@@ -100,18 +80,14 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 
 		override fun onSessionResumed(session: CastSession, wasSuspended: Boolean) {
 			attachRemoteClientCallback(session)
-			startRemoteStatusPolling()
 			emitStatus("connected", session.castDevice?.friendlyName)
-			startPendingCastRequest(session)
 		}
 
 		override fun onSessionResumeFailed(session: CastSession, error: Int) {
-			clearPendingCastRequest()
 			emitStatus("error", message = "Cast session failed to resume ($error)")
 		}
 
 		override fun onSessionSuspended(session: CastSession, reason: Int) {
-			stopRemoteStatusPolling()
 			detachRemoteClientCallback()
 			emitStatus("idle")
 		}
@@ -120,8 +96,8 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 	override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
 		super.configureFlutterEngine(flutterEngine)
 
-		methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, METHOD_CHANNEL)
+		MethodChannel(flutterEngine.dartExecutor.binaryMessenger, METHOD_CHANNEL)
-			.apply { setMethodCallHandler(this@MainActivity) }
+			.setMethodCallHandler(this)
 
 		EventChannel(flutterEngine.dartExecutor.binaryMessenger, EVENT_CHANNEL)
 			.setStreamHandler(this)
@@ -138,14 +114,13 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 		when (call.method) {
 			"getStatus" -> result.success(statusPayload)
 			"showDevicePicker" -> {
-				showDevicePicker(call)
+				showDevicePicker()
 				result.success(null)
 			}
 			"startCastingLiveStream" -> {
 				startCastingLiveStream(call, result)
 			}
 			"disconnect" -> {
-				clearPendingCastRequest()
 				castContext?.sessionManager?.endCurrentSession(true)
 				emitStatus("idle")
 				result.success(null)
@@ -199,15 +174,12 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 		}
 	}
 
-	private fun showDevicePicker(call: MethodCall) {
+	private fun showDevicePicker() {
 		if (castContext == null) {
-			clearPendingCastRequest()
 			emitStatus("unavailable", message = "Cast services unavailable")
 			return
 		}
 
-		setPendingCastRequest(parsePendingCastRequest(call.arguments))
-
 		val receiverAppId = getString(R.string.cast_receiver_app_id)
 		val routeSelector = MediaRouteSelector.Builder()
 			.addControlCategory(CastMediaControlIntent.categoryForCast(receiverAppId))
@@ -238,7 +210,6 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 		val currentStatus = statusPayload["status"] as? String
 
 		if (currentSession == null && currentStatus == "connecting") {
-			clearPendingCastRequest()
 			emitStatus("idle")
 		}
 	}
@@ -265,113 +236,6 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 			return
 		}
 
-		val loadRequestData = buildLoadRequestData(
-			streamUrl = streamUrl,
-			title = title,
-			subtitle = subtitle,
-		)
-
-		loadMediaWithRetry(
-			session = currentSession,
-			loadRequestData = loadRequestData,
-			attempt = 1,
-			result = result,
-		)
-	}
-
-	private fun setPendingCastRequest(request: PendingCastRequest?) {
-		pendingCastRequest = request
-		pendingCastRequestInFlight = false
-		pendingCastAutoplayRetryCount = 0
-	}
-
-	private fun clearPendingCastRequest() {
-		setPendingCastRequest(null)
-	}
-
-	private fun parsePendingCastRequest(arguments: Any?): PendingCastRequest? {
-		val map = arguments as? Map<*, *> ?: return null
-		val shouldAutoplay = map["autoplay"] as? Boolean ?: false
-		if (!shouldAutoplay) {
-			return null
-		}
-
-		val streamUrl = map["streamUrl"] as? String
-		if (streamUrl.isNullOrBlank()) {
-			return null
-		}
-
-		return PendingCastRequest(
-			streamUrl = streamUrl,
-			title = map["title"] as? String ?: "Live Stream",
-			subtitle = map["subtitle"] as? String ?: "",
-		)
-	}
-
-	private fun startPendingCastRequest(session: CastSession) {
-		val request = pendingCastRequest ?: return
-		if (pendingCastRequestInFlight) {
-			return
-		}
-		pendingCastRequestInFlight = true
-
-		loadMediaWithRetry(
-			session = session,
-			loadRequestData = buildLoadRequestData(
-				streamUrl = request.streamUrl,
-				title = request.title,
-				subtitle = request.subtitle,
-			),
-			attempt = 1,
-			result = object : MethodChannel.Result {
-				override fun success(result: Any?) {
-					clearPendingCastRequest()
-				}
-
-				override fun error(errorCode: String, errorMessage: String?, errorDetails: Any?) {
-					pendingCastRequestInFlight = false
-					schedulePendingCastRequestRetry(errorMessage ?: errorCode)
-				}
-
-				override fun notImplemented() {}
-			},
-		)
-	}
-
-	private fun schedulePendingCastRequestRetry(message: String) {
-		val request = pendingCastRequest
-		val currentSession = castContext?.sessionManager?.currentCastSession
-		if (request == null || currentSession == null || !currentSession.isConnected) {
-			clearPendingCastRequest()
-			emitStatus("error", message = message)
-			return
-		}
-
-		if (pendingCastAutoplayRetryCount >= MAX_PENDING_CAST_AUTOPLAY_RETRIES) {
-			clearPendingCastRequest()
-			emitStatus("error", message = message)
-			return
-		}
-
-		pendingCastAutoplayRetryCount += 1
-		mainHandler.postDelayed(
-			{
-				val resumedSession = castContext?.sessionManager?.currentCastSession
-				if (resumedSession != null && resumedSession.isConnected) {
-					startPendingCastRequest(resumedSession)
-				} else {
-					clearPendingCastRequest()
-				}
-			},
-			1000,
-		)
-	}
-
-	private fun buildLoadRequestData(
-		streamUrl: String,
-		title: String,
-		subtitle: String,
-	): MediaLoadRequestData {
 		val metadata = MediaMetadata(MediaMetadata.MEDIA_TYPE_MUSIC_TRACK).apply {
 			putString(MediaMetadata.KEY_TITLE, title)
 			putString(MediaMetadata.KEY_SUBTITLE, subtitle)
@@ -383,10 +247,17 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 			.setMetadata(metadata)
 			.build()
 
-		return MediaLoadRequestData.Builder()
+		val loadRequestData = MediaLoadRequestData.Builder()
 			.setMediaInfo(mediaInfo)
 			.setAutoplay(true)
 			.build()
+
+		loadMediaWithRetry(
+			session = currentSession,
+			loadRequestData = loadRequestData,
+			attempt = 1,
+			result = result,
+		)
 	}
 
 	private fun loadMediaWithRetry(
@@ -421,14 +292,14 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 
 		try {
 			remoteMediaClient.load(loadRequestData).setResultCallback { mediaChannelResult ->
+				if (mediaChannelResult == null) {
+					emitStatus("error", message = "Cast load returned no result")
+					result.error("cast_load_failed", "Cast load returned no result", null)
+					return@setResultCallback
+				}
+
 				if (mediaChannelResult.status.isSuccess) {
-					// Stop local playback immediately when remote load succeeds
-					// This MUST be done in Kotlin (not Flutter) because the audio service
-					// session may be active from Android Auto and won't respond to Flutter calls
-					stopAudioServiceSession()
-					
 					emitStatus("connected", session.castDevice?.friendlyName)
-					// Force initial remote status update and continue polling
 					emitRemotePlaybackStatus()
 					result.success(null)
 					return@setResultCallback
@@ -460,6 +331,11 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 
 		try {
 			remoteMediaClient.stop().setResultCallback { stopResult ->
+				if (stopResult == null) {
+					result.error("cast_stop_failed", "Cast stop returned no result", null)
+					return@setResultCallback
+				}
+
 				if (stopResult.status.isSuccess) {
 					emitStatus("connected", session.castDevice?.friendlyName, playbackStatus = "stopped")
 					result.success(null)
@@ -490,59 +366,22 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 		detachRemoteClientCallback()
 		activeRemoteMediaClient = remoteMediaClient
 		remoteMediaClient.registerCallback(remoteMediaClientCallback)
-		startRemoteStatusPolling()
-		if (pendingCastRequest != null) {
-			startPendingCastRequest(session)
-		}
 		emitRemotePlaybackStatus()
 	}
 
 	private fun detachRemoteClientCallback() {
-		stopRemoteStatusPolling()
 		activeRemoteMediaClient?.unregisterCallback(remoteMediaClientCallback)
 		activeRemoteMediaClient = null
 	}
 
-	private fun startRemoteStatusPolling() {
-		if (remoteCastStatusPollingRunnable != null) {
-			return
-		}
-
-		val pollRunnable = object : Runnable {
-			override fun run() {
-				try {
-					if (activeRemoteMediaClient != null) {
-						emitRemotePlaybackStatus()
-						// Use mainHandler to keep polling alive across lifecycle changes
-						mainHandler.postDelayed(this, REMOTE_STATUS_POLL_INTERVAL_MS)
-					}
-				} catch (e: Exception) {
-					// Safely handle any errors to keep polling thread alive
-					e.printStackTrace()
-				}
-			}
-		}
-
-		remoteCastStatusPollingRunnable = pollRunnable
-		mainHandler.post(pollRunnable)
-	}
-
-	private fun stopRemoteStatusPolling() {
-		val runnable = remoteCastStatusPollingRunnable ?: return
-		mainHandler.removeCallbacks(runnable)
-		remoteCastStatusPollingRunnable = null
-	}
-
 	private fun emitRemotePlaybackStatus() {
 		val remoteMediaClient = activeRemoteMediaClient
-		if (remoteMediaClient == null) return
+		val mediaStatus = remoteMediaClient?.mediaStatus
-		
-		val mediaStatus = remoteMediaClient.mediaStatus
 		val playbackStatus = when (mediaStatus?.playerState) {
 			MediaStatus.PLAYER_STATE_PLAYING -> "playing"
 			MediaStatus.PLAYER_STATE_BUFFERING,
 			MediaStatus.PLAYER_STATE_LOADING -> "buffering"
-			MediaStatus.PLAYER_STATE_PAUSED -> "stopped"
+			MediaStatus.PLAYER_STATE_PAUSED,
 			MediaStatus.PLAYER_STATE_IDLE,
 			MediaStatus.PLAYER_STATE_UNKNOWN,
 			null -> "stopped"
@@ -555,40 +394,6 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
 		}
 	}
 
-	private fun stopLocalAudioPlayback() {
-		try {
-			// Tell Flutter side to stop local audio via method channel
-			// This prevents audio from playing on both mobile and cast device
-			methodChannel?.invokeMethod("stopLocalAudio", null)
-		} catch (e: Exception) {
-			// Silently handle if Flutter side doesn't implement this method
-			e.printStackTrace()
-		}
-	}
-
-	private fun stopAudioServiceSession() {
-		try {
-			// Stop the audio service session directly (works even if app is in background via Android Auto)
-			// This ensures the shared audio handler doesn't keep playing when cast device takes over
-			// Access the audio service through the session token if available
-			methodChannel?.invokeMethod("stopAudioService", null)
-		} catch (e: Exception) {
-			// Audio service might not be available, silently continue
-			e.printStackTrace()
-		}
-	}
-
-	private fun restartAudioServiceSession() {
-		try {
-			// When cast session ends, allow the audio service to resume management
-			// This re-enables local playback for the Flutter side
-			methodChannel?.invokeMethod("resumeLocalAudio", null)
-		} catch (e: Exception) {
-			// If Flutter handler isn't ready, that's ok - audio service will be managed externally
-			e.printStackTrace()
-		}
-	}
-
 	private fun emitStatus(
 		status: String,
 		deviceName: String? = null,

ios/Runner/AppDelegate.swift

@@ -2,76 +2,12 @@ import Flutter
 import UIKit
 import AVFoundation
 import AVKit
-import MediaPlayer
-
-private struct CarPlayPlaybackSnapshot {
-  var playbackStatus: String
-  var title: String
-  var subtitle: String
-  var album: String
-  var isLive: Bool
-  var seekable: Bool
-
-  static let `default` = CarPlayPlaybackSnapshot(
-    playbackStatus: "stopped",
-    title: "KRYZ Live Stream",
-    subtitle: "KRYZ Radio",
-    album: "Live",
-    isLive: true,
-    seekable: false
-  )
-
-  init(
-    playbackStatus: String,
-    title: String,
-    subtitle: String,
-    album: String,
-    isLive: Bool,
-    seekable: Bool
-  ) {
-    self.playbackStatus = playbackStatus
-    self.title = title
-    self.subtitle = subtitle
-    self.album = album
-    self.isLive = isLive
-    self.seekable = seekable
-  }
-
-  init(payload: [String: Any], fallback: CarPlayPlaybackSnapshot) {
-    let status = (payload["playbackStatus"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-    let title = (payload["title"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-    let subtitle = (payload["subtitle"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-    let album = (payload["album"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-
-    playbackStatus = (status?.isEmpty == false) ? status! : fallback.playbackStatus
-    self.title = (title?.isEmpty == false) ? title! : fallback.title
-    self.subtitle = (subtitle?.isEmpty == false) ? subtitle! : fallback.subtitle
-    self.album = (album?.isEmpty == false) ? album! : fallback.album
-    isLive = payload["isLive"] as? Bool ?? fallback.isLive
-    seekable = payload["seekable"] as? Bool ?? fallback.seekable
-  }
-
-  func asDictionary() -> [String: Any] {
-    [
-      "playbackStatus": playbackStatus,
-      "title": title,
-      "subtitle": subtitle,
-      "album": album,
-      "isLive": isLive,
-      "seekable": seekable
-    ]
-  }
-}
 
 @main
 @objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate, FlutterStreamHandler {
   private let castingMethodChannelName = "kryz_go_flutter/casting/methods"
   private let castingEventChannelName = "kryz_go_flutter/casting/events"
   private let playbackMethodChannelName = "kryz_go_flutter/playback/methods"
-  private let carPlayMethodChannelName = "kryz_go_flutter/carplay/methods"
-
-  static let carPlaySnapshotDidChangeNotification = Notification.Name("KRYZCarPlaySnapshotDidChange")
-  static let carPlaySnapshotUserInfoKey = "snapshot"
 
   private var castingEventSink: FlutterEventSink?
   private var castingStatus: [String: Any] = [
@@ -79,13 +15,6 @@ private struct CarPlayPlaybackSnapshot {
     "platform": "ios"
   ]
   private var playbackMethodChannel: FlutterMethodChannel?
-  private var carPlayMethodChannel: FlutterMethodChannel?
-  private var carPlaySnapshot = CarPlayPlaybackSnapshot.default
-  private var headlessFlutterEngine: FlutterEngine?
-  private var playCommandTarget: Any?
-  private var togglePlayPauseCommandTarget: Any?
-  private var pauseCommandTarget: Any?
-  private var stopCommandTarget: Any?
 
   override func application(
     _ application: UIApplication,
@@ -108,67 +37,14 @@ private struct CarPlayPlaybackSnapshot {
     )
 
     updateCastingStatusForCurrentRoute()
-    ensureFlutterBridgeReadyForCarPlay()
 
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
 
   func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
     GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
-    configureChannels(with: engineBridge.pluginRegistry)
 
-    if let engine = headlessFlutterEngine {
+    guard let registrar = engineBridge.pluginRegistry.registrar(forPlugin: "CastingBridge") else {
-      engine.destroyContext()
-      headlessFlutterEngine = nil
-    }
-  }
-
-  /// Invoke play on the Flutter audio engine. Called by CarPlaySceneDelegate.
-  func invokePlay() {
-    ensureFlutterBridgeReadyForCarPlay()
-    playbackMethodChannel?.invokeMethod("play", arguments: nil)
-  }
-
-  /// Invoke stop on the Flutter audio engine. Called by CarPlaySceneDelegate.
-  func invokeStop() {
-    ensureFlutterBridgeReadyForCarPlay()
-    playbackMethodChannel?.invokeMethod("stop", arguments: nil)
-  }
-
-  func currentCarPlaySnapshot() -> [String: Any] {
-    carPlaySnapshot.asDictionary()
-  }
-
-  func requestCarPlaySnapshot() {
-    ensureFlutterBridgeReadyForCarPlay()
-    carPlayMethodChannel?.invokeMethod("getStateSnapshot", arguments: nil) { [weak self] response in
-      guard let payload = response as? [String: Any] else {
-        return
-      }
-
-      self?.applyCarPlaySnapshot(payload)
-    }
-  }
-
-  func ensureFlutterBridgeReadyForCarPlay() {
-    if playbackMethodChannel != nil, carPlayMethodChannel != nil {
-      return
-    }
-
-    if let engine = headlessFlutterEngine {
-      configureChannels(with: engine)
-      return
-    }
-
-    let engine = FlutterEngine(name: "kryz_carplay_headless_engine", project: nil, allowHeadlessExecution: true)
-    headlessFlutterEngine = engine
-    engine.run()
-    GeneratedPluginRegistrant.register(with: engine)
-    configureChannels(with: engine)
-  }
-
-  private func configureChannels(with registry: FlutterPluginRegistry) {
-    guard let registrar = registry.registrar(forPlugin: "CastingBridge") else {
       return
     }
 
@@ -191,17 +67,16 @@ private struct CarPlayPlaybackSnapshot {
       name: playbackMethodChannelName,
       binaryMessenger: registrar.messenger()
     )
+  }
 
-    carPlayMethodChannel = FlutterMethodChannel(
+  /// Invoke play on the Flutter audio engine. Called by CarPlaySceneDelegate.
-      name: carPlayMethodChannelName,
+  func invokePlay() {
-      binaryMessenger: registrar.messenger()
+    playbackMethodChannel?.invokeMethod("play", arguments: nil)
-    )
+  }
-    carPlayMethodChannel?.setMethodCallHandler { [weak self] call, result in
-      self?.handleCarPlayMethod(call: call, result: result)
-    }
 
-    configureRemoteCommandCenterIfNeeded()
+  /// Invoke stop on the Flutter audio engine. Called by CarPlaySceneDelegate.
-    requestCarPlaySnapshot()
+  func invokeStop() {
+    playbackMethodChannel?.invokeMethod("stop", arguments: nil)
   }
 
   @objc private func handleAudioRouteChange() {
@@ -228,132 +103,6 @@ private struct CarPlayPlaybackSnapshot {
     }
   }
 
-  private func handleCarPlayMethod(call: FlutterMethodCall, result: @escaping FlutterResult) {
-    switch call.method {
-    case "syncState":
-      guard let payload = call.arguments as? [String: Any] else {
-        result(
-          FlutterError(
-            code: "invalid_payload",
-            message: "Expected map payload for syncState",
-            details: nil
-          )
-        )
-        return
-      }
-
-      applyCarPlaySnapshot(payload)
-      result(nil)
-    case "getCachedState":
-      result(carPlaySnapshot.asDictionary())
-    default:
-      result(FlutterMethodNotImplemented)
-    }
-  }
-
-  private func applyCarPlaySnapshot(_ payload: [String: Any]) {
-    carPlaySnapshot = CarPlayPlaybackSnapshot(payload: payload, fallback: carPlaySnapshot)
-    updateNowPlayingInfoCenter(using: carPlaySnapshot)
-    NotificationCenter.default.post(
-      name: Self.carPlaySnapshotDidChangeNotification,
-      object: self,
-      userInfo: [Self.carPlaySnapshotUserInfoKey: carPlaySnapshot.asDictionary()]
-    )
-  }
-
-  private func updateNowPlayingInfoCenter(using snapshot: CarPlayPlaybackSnapshot) {
-    var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [:]
-    nowPlayingInfo[MPMediaItemPropertyTitle] = snapshot.title
-    nowPlayingInfo[MPMediaItemPropertyArtist] = snapshot.subtitle
-    nowPlayingInfo[MPMediaItemPropertyAlbumTitle] = snapshot.album
-    nowPlayingInfo[MPNowPlayingInfoPropertyIsLiveStream] = snapshot.isLive
-    nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = snapshot.playbackStatus == "playing" ? 1.0 : 0.0
-    nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = 0.0
-    MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
-
-    if #available(iOS 13.0, *) {
-      let playbackState: MPNowPlayingPlaybackState = switch snapshot.playbackStatus {
-      case "playing":
-        .playing
-      case "buffering":
-        .playing
-      default:
-        .stopped
-      }
-      MPNowPlayingInfoCenter.default().playbackState = playbackState
-    }
-  }
-
-  private func configureRemoteCommandCenterIfNeeded() {
-    if playCommandTarget != nil ||
-      togglePlayPauseCommandTarget != nil ||
-      pauseCommandTarget != nil ||
-      stopCommandTarget != nil {
-      return
-    }
-
-    let commandCenter = MPRemoteCommandCenter.shared()
-    commandCenter.changePlaybackPositionCommand.isEnabled = false
-    commandCenter.seekForwardCommand.isEnabled = false
-    commandCenter.seekBackwardCommand.isEnabled = false
-    commandCenter.nextTrackCommand.isEnabled = false
-    commandCenter.previousTrackCommand.isEnabled = false
-
-    commandCenter.playCommand.isEnabled = true
-    playCommandTarget = commandCenter.playCommand.addTarget { [weak self] _ in
-      self?.invokePlay()
-      return .success
-    }
-
-    commandCenter.togglePlayPauseCommand.isEnabled = true
-    togglePlayPauseCommandTarget = commandCenter.togglePlayPauseCommand.addTarget { [weak self] _ in
-      guard let self else {
-        return .commandFailed
-      }
-
-      switch self.carPlaySnapshot.playbackStatus {
-      case "playing", "buffering":
-        self.invokeStop()
-      default:
-        self.invokePlay()
-      }
-
-      return .success
-    }
-
-    commandCenter.pauseCommand.isEnabled = true
-    pauseCommandTarget = commandCenter.pauseCommand.addTarget { [weak self] _ in
-      self?.invokeStop()
-      return .success
-    }
-
-    commandCenter.stopCommand.isEnabled = true
-    stopCommandTarget = commandCenter.stopCommand.addTarget { [weak self] _ in
-      self?.invokeStop()
-      return .success
-    }
-  }
-
-  private func teardownRemoteCommandCenter() {
-    let commandCenter = MPRemoteCommandCenter.shared()
-    if let target = playCommandTarget {
-      commandCenter.playCommand.removeTarget(target)
-    }
-    if let target = togglePlayPauseCommandTarget {
-      commandCenter.togglePlayPauseCommand.removeTarget(target)
-    }
-    if let target = pauseCommandTarget {
-      commandCenter.pauseCommand.removeTarget(target)
-    }
-    if let target = stopCommandTarget {
-      commandCenter.stopCommand.removeTarget(target)
-    }
-    playCommandTarget = nil
-    togglePlayPauseCommandTarget = nil
-    pauseCommandTarget = nil
-    stopCommandTarget = nil
-  }
-
   private func showAirPlayPicker() {
     DispatchQueue.main.async {
       guard let rootViewController = self.activeRootViewController() else {
@@ -427,6 +176,5 @@ private struct CarPlayPlaybackSnapshot {
 
   deinit {
     NotificationCenter.default.removeObserver(self)
-    teardownRemoteCommandCenter()
   }
 }

ios/Runner/CarPlaySceneDelegate.swift

@@ -14,46 +14,10 @@ import UIKit
  * Note: the com.apple.developer.carplay-audio entitlement must be enabled in the
  * Apple Developer Portal and added to the target in Xcode Signing & Capabilities.
  */
-class CarPlaySceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate, CPListTemplateDelegate {
+class CarPlaySceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate {
-
-  private struct Snapshot {
-    var playbackStatus: String
-    var title: String
-    var subtitle: String
-    var album: String
-
-    init(playbackStatus: String, title: String, subtitle: String, album: String) {
-      self.playbackStatus = playbackStatus
-      self.title = title
-      self.subtitle = subtitle
-      self.album = album
-    }
-
-    static let `default` = Snapshot(
-      playbackStatus: "stopped",
-      title: "KRYZ Live Stream",
-      subtitle: "KRYZ Radio",
-      album: "Live"
-    )
-
-    init(payload: [String: Any]?) {
-      let base = Snapshot.default
-      let status = (payload?["playbackStatus"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-      let title = (payload?["title"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-      let subtitle = (payload?["subtitle"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-      let album = (payload?["album"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-
-      playbackStatus = (status?.isEmpty == false) ? status! : base.playbackStatus
-      self.title = (title?.isEmpty == false) ? title! : base.title
-      self.subtitle = (subtitle?.isEmpty == false) ? subtitle! : base.subtitle
-      self.album = (album?.isEmpty == false) ? album! : base.album
-    }
-  }
 
   private var carPlayInterfaceController: CPInterfaceController?
   private var listTemplate: CPListTemplate?
-  private var streamItem: CPListItem?
-  private var snapshot: Snapshot = .default
 
   // MARK: - CPTemplateApplicationSceneDelegate
 
@@ -61,36 +25,14 @@ class CarPlaySceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate, CPL
     _ templateApplicationScene: CPTemplateApplicationScene,
     didConnect interfaceController: CPInterfaceController
   ) {
-    appDelegate?.ensureFlutterBridgeReadyForCarPlay()
     carPlayInterfaceController = interfaceController
-    snapshot = Snapshot(payload: appDelegate?.currentCarPlaySnapshot())
+    interfaceController.setRootTemplate(makeListTemplate(), animated: false, completion: nil)
-
-    let rootTemplate = makeListTemplate()
-    if #available(iOS 14.0, *) {
-      interfaceController.setRootTemplate(rootTemplate, animated: false, completion: nil)
-    } else {
-      // iOS 13 fallback: use API variant available before iOS 14.
-      interfaceController.setRootTemplate(rootTemplate, animated: false)
-    }
-
-    NotificationCenter.default.addObserver(
-      self,
-      selector: #selector(handleCarPlaySnapshotChanged(_:)),
-      name: AppDelegate.carPlaySnapshotDidChangeNotification,
-      object: nil
-    )
-    appDelegate?.requestCarPlaySnapshot()
   }
 
   func templateApplicationScene(
     _ templateApplicationScene: CPTemplateApplicationScene,
     didDisconnectInterfaceController interfaceController: CPInterfaceController
   ) {
-    NotificationCenter.default.removeObserver(
-      self,
-      name: AppDelegate.carPlaySnapshotDidChangeNotification,
-      object: nil
-    )
     carPlayInterfaceController = nil
     listTemplate = nil
     appDelegate?.invokeStop()
@@ -99,105 +41,40 @@ class CarPlaySceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate, CPL
   // MARK: - Template construction
 
   private func makeListTemplate() -> CPListTemplate {
+    let artwork = CPListItem.maximumImageSize
     let icon = UIImage(named: "AppIcon")?
       .withRenderingMode(.alwaysOriginal)
 
     let item = CPListItem(
-      text: snapshot.title,
+      text: "KRYZ Live Stream",
-      detailText: detailText(for: snapshot),
+      detailText: "KRYZ Radio",
       image: icon
     )
-    streamItem = item
+    item.handler = { [weak self] _, completion in
-
+      self?.handleStreamItemTapped()
-    if #available(iOS 14.0, *) {
+      completion()
-      item.handler = { [weak self] _, completion in
-        self?.handleStreamItemTapped()
-        completion()
-      }
     }
 
     let section = CPListSection(items: [item])
     let template = CPListTemplate(title: "KRYZ Go!", sections: [section])
-
+    template.tabTitle = "KRYZ Go!"
-    if #unavailable(iOS 14.0) {
+    template.tabImage = icon
-      // iOS 13 fallback: use list delegate selection callback.
-      template.delegate = self
-    }
-
-    if #available(iOS 14.0, *) {
-      template.tabTitle = "KRYZ Go!"
-      template.tabImage = icon
-    }
 
     listTemplate = template
+    // Silence unused-variable warning
+    _ = artwork
     return template
   }
 
-  private func detailText(for snapshot: Snapshot) -> String {
-    let statusText: String = switch snapshot.playbackStatus {
-    case "playing":
-      "Playing"
-    case "buffering":
-      "Buffering"
-    default:
-      "Stopped"
-    }
-
-    if snapshot.subtitle.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
-      return statusText
-    }
-
-    return "\(snapshot.subtitle) • \(statusText)"
-  }
-
-  @objc private func handleCarPlaySnapshotChanged(_ notification: Notification) {
-    guard
-      let payload = notification.userInfo?[AppDelegate.carPlaySnapshotUserInfoKey] as? [String: Any]
-    else {
-      return
-    }
-
-    snapshot = Snapshot(payload: payload)
-    refreshTemplatesForSnapshot()
-  }
-
-  private func refreshTemplatesForSnapshot() {
-    guard let interfaceController = carPlayInterfaceController else {
-      return
-    }
-
-    if #available(iOS 14.0, *), interfaceController.topTemplate is CPNowPlayingTemplate {
-      // Preserve Now Playing navigation stack while metadata updates are flowing.
-      return
-    }
-
-    let updatedTemplate = makeListTemplate()
-    if #available(iOS 14.0, *) {
-      interfaceController.setRootTemplate(updatedTemplate, animated: false, completion: nil)
-    } else {
-      interfaceController.setRootTemplate(updatedTemplate, animated: false)
-    }
-  }
-
   // MARK: - Playback
 
   private func handleStreamItemTapped() {
     appDelegate?.invokePlay()
-    appDelegate?.requestCarPlaySnapshot()
+    carPlayInterfaceController?.pushTemplate(
-    guard let interfaceController = carPlayInterfaceController else {
+      CPNowPlayingTemplate.shared,
-      return
+      animated: true,
-    }
+      completion: nil
-
+    )
-    if #available(iOS 14.0, *) {
-      interfaceController.pushTemplate(
-        CPNowPlayingTemplate.shared,
-        animated: true,
-        completion: nil
-      )
-    } else {
-      // iOS 13 fallback: no CPNowPlayingTemplate.shared API.
-      // Keep playback running and remain on the list template.
-    }
   }
 
   // MARK: - Helpers
@@ -205,20 +82,4 @@ class CarPlaySceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate, CPL
   private var appDelegate: AppDelegate? {
     UIApplication.shared.delegate as? AppDelegate
   }
-
-  // MARK: - CPListTemplateDelegate (iOS 13 fallback)
-
-  func listTemplate(
-    _ listTemplate: CPListTemplate,
-    didSelect item: CPListItem,
-    completionHandler: @escaping () -> Void
-  ) {
-    defer { completionHandler() }
-
-    guard item == streamItem else {
-      return
-    }
-
-    handleStreamItemTapped()
-  }
 }

lib/carplay_bridge.dart

@@ -1,79 +0,0 @@
-import 'package:flutter/services.dart';
-
-import 'streaming_audio_business_object.dart';
-
-class CarPlayBridge {
-  CarPlayBridge({required StreamingAudioBusinessObject audio}) : _audio = audio;
-
-  static const MethodChannel _channel = MethodChannel(
-    'kryz_go_flutter/carplay/methods',
-  );
-
-  final StreamingAudioBusinessObject _audio;
-  bool _isStarted = false;
-
-  Future<void> start() async {
-    if (_isStarted) {
-      return;
-    }
-
-    _isStarted = true;
-    _channel.setMethodCallHandler(_handleNativeMethodCall);
-    _audio.addListener(_onAudioChanged);
-    await _pushSnapshotToNative();
-  }
-
-  Future<void> dispose() async {
-    if (!_isStarted) {
-      return;
-    }
-
-    _isStarted = false;
-    _audio.removeListener(_onAudioChanged);
-    _channel.setMethodCallHandler(null);
-  }
-
-  Map<String, dynamic> _snapshot() {
-    final String playbackStatus = switch (_audio.playbackStatus) {
-      StreamingPlaybackStatus.playing => 'playing',
-      StreamingPlaybackStatus.buffering => 'buffering',
-      StreamingPlaybackStatus.stopped => 'stopped',
-    };
-
-    return <String, dynamic>{
-      'playbackStatus': playbackStatus,
-      'isPlaying': _audio.isPlaying,
-      'isBuffering': _audio.isBuffering,
-      'isLive': true,
-      'seekable': false,
-      'title': _audio.currentTitle,
-      'subtitle': _audio.currentSubtitle,
-      'album': 'Live',
-    };
-  }
-
-  Future<dynamic> _handleNativeMethodCall(MethodCall call) async {
-    switch (call.method) {
-      case 'getStateSnapshot':
-        return _snapshot();
-      default:
-        throw MissingPluginException(
-          'Unknown CarPlay bridge method: ${call.method}',
-        );
-    }
-  }
-
-  void _onAudioChanged() {
-    _pushSnapshotToNative();
-  }
-
-  Future<void> _pushSnapshotToNative() async {
-    try {
-      await _channel.invokeMethod<void>('syncState', _snapshot());
-    } on MissingPluginException {
-      // CarPlay bridge only exists on iOS native builds.
-    } on PlatformException {
-      // Keep playback working even if native sync temporarily fails.
-    }
-  }
-}

lib/casting_business_object.dart

@@ -20,9 +20,6 @@ class CastingBusinessObject extends ChangeNotifier {
   CastingPlaybackStatus _playbackStatus = CastingPlaybackStatus.unknown;
   String? _connectedDeviceName;
   String? _lastError;
-  
-  /// Callback for when native side requests local audio to stop
-  VoidCallback? onStopLocalAudioRequested;
 
   CastingStatus get status => _status;
   CastingPlaybackStatus get playbackStatus => _playbackStatus;
@@ -58,18 +55,6 @@ class CastingBusinessObject extends ChangeNotifier {
       },
     );
 
-    // Set up handler for native method calls (e.g., stopLocalAudio)
-    _methodChannel.setMethodCallHandler(_handleMethodCall);
-
-    await refreshStatus();
-  }
-
-  Future<void> refreshStatus() async {
-    if (!isSupportedOnThisPlatform) {
-      _setStatus(CastingStatus.unavailable);
-      return;
-    }
-
     try {
       final dynamic status = await _methodChannel.invokeMethod<dynamic>(
         'getStatus',
@@ -81,12 +66,7 @@ class CastingBusinessObject extends ChangeNotifier {
     }
   }
 
-  Future<void> showDevicePicker({
+  Future<void> showDevicePicker() async {
-    bool autoplay = false,
-    String? streamUrl,
-    String? title,
-    String? subtitle,
-  }) async {
     if (!isSupportedOnThisPlatform) {
       _setStatus(CastingStatus.unavailable);
       return;
@@ -97,12 +77,7 @@ class CastingBusinessObject extends ChangeNotifier {
     }
 
     try {
-      await _methodChannel.invokeMethod<void>('showDevicePicker', {
+      await _methodChannel.invokeMethod<void>('showDevicePicker');
-        'autoplay': autoplay,
-        'streamUrl': streamUrl,
-        'title': title,
-        'subtitle': subtitle,
-      });
     } on PlatformException catch (error) {
       _lastError = error.message ?? error.code;
       _setStatus(CastingStatus.error);
@@ -127,10 +102,7 @@ class CastingBusinessObject extends ChangeNotifier {
       });
     } on PlatformException catch (error) {
       _lastError = error.message ?? error.code;
-      // Do NOT set status to error here — native emits its own status events.
+      _setStatus(CastingStatus.error);
-      // Overriding status from Dart corrupts the UI when native considers the
-      // session still connected (e.g. during a retry after a race condition).
-      rethrow;
     }
   }
 
@@ -174,8 +146,6 @@ class CastingBusinessObject extends ChangeNotifier {
 
     if (deviceName != null && deviceName.isNotEmpty) {
       _connectedDeviceName = deviceName;
-    } else if (status != 'connected') {
-      _connectedDeviceName = null;
     }
 
     if (message != null && message.isNotEmpty) {
@@ -240,22 +210,4 @@ class CastingBusinessObject extends ChangeNotifier {
     _eventSubscription?.cancel();
     super.dispose();
   }
-
-  /// Handles method calls from native code
-  Future<dynamic> _handleMethodCall(MethodCall call) async {
-    switch (call.method) {
-      case 'stopLocalAudio':
-        onStopLocalAudioRequested?.call();
-        return null;
-      case 'stopAudioService':
-        // Stop the audio service directly (called when transferring to cast)
-        onStopLocalAudioRequested?.call();
-        return null;
-      case 'resumeLocalAudio':
-        // Audio service is resuming after cast disconnect; no action needed on Flutter side
-        return null;
-      default:
-        return null;
-    }
-  }
 }

lib/kryz_audio_handler.dart

@@ -18,8 +18,7 @@ class KryzAudioHandler extends BaseAudioHandler with SeekHandler {
 
   static const String streamUrl = 'https://kryz.out.airtime.pro/kryz_a';
   static const String mediaId = 'kryz-live-stream';
-  static const String _liveInfoEndpoint =
+  static const String _liveInfoEndpoint = 'http://kryz.airtime.pro/api/live-info';
-      'http://kryz.airtime.pro/api/live-info';
   static const Duration _liveInfoTimeout = Duration(seconds: 8);
   static const Duration _metadataRefreshInterval = Duration(seconds: 20);
 
@@ -28,7 +27,10 @@ class KryzAudioHandler extends BaseAudioHandler with SeekHandler {
     title: 'KRYZ Live Stream',
     artist: 'KRYZ Radio',
     album: 'Live',
-    extras: <String, dynamic>{'isLive': true, 'seekable': false},
+    extras: <String, dynamic>{
+      'isLive': true,
+      'seekable': false,
+    },
   );
 
   final AudioPlayer _player = AudioPlayer();
@@ -80,7 +82,10 @@ class KryzAudioHandler extends BaseAudioHandler with SeekHandler {
     try {
       if (!_isSourceLoaded) {
         await _player.setAudioSource(
-          AudioSource.uri(Uri.parse(streamUrl), tag: mediaItem.value),
+          AudioSource.uri(
+            Uri.parse(streamUrl),
+            tag: mediaItem.value,
+          ),
         );
         _isSourceLoaded = true;
       }
@@ -121,13 +126,6 @@ class KryzAudioHandler extends BaseAudioHandler with SeekHandler {
     );
   }
 
-  @override
-  Future<void> pause() async {
-    // CarPlay and lock-screen transport may issue pause for live streams.
-    // Treat pause as stop to keep behavior consistent across platforms.
-    await stop();
-  }
-
   @override
   Future<void> seek(Duration position) async {
     // Live stream is intentionally non-seekable.
@@ -160,35 +158,25 @@ class KryzAudioHandler extends BaseAudioHandler with SeekHandler {
   }
 
   void _onPlayerStateChanged(PlayerState state) {
-    final AudioProcessingState processingState =
+    final AudioProcessingState processingState = switch (state.processingState) {
-        switch (state.processingState) {
+      ProcessingState.idle => AudioProcessingState.idle,
-          ProcessingState.idle => AudioProcessingState.idle,
+      ProcessingState.loading => AudioProcessingState.loading,
-          ProcessingState.loading => AudioProcessingState.loading,
+      ProcessingState.buffering => AudioProcessingState.buffering,
-          ProcessingState.buffering => AudioProcessingState.buffering,
+      ProcessingState.ready => AudioProcessingState.ready,
-          ProcessingState.ready => AudioProcessingState.ready,
+      ProcessingState.completed => AudioProcessingState.completed,
-          ProcessingState.completed => AudioProcessingState.completed,
+    };
-        };
 
-    final bool isPlaying =
+    final bool isPlaying = state.playing && state.processingState == ProcessingState.ready;
-        state.playing && state.processingState == ProcessingState.ready;
+    final bool isBuffering = (state.playing && state.processingState != ProcessingState.ready) ||
-    final bool isBuffering =
+        (_playRequested && !state.playing && state.processingState != ProcessingState.completed);
-        (state.playing && state.processingState != ProcessingState.ready) ||
-        (_playRequested &&
-            !state.playing &&
-            state.processingState != ProcessingState.completed);
 
     playbackState.add(
       playbackState.value.copyWith(
         controls: <MediaControl>[
-          if (isPlaying || isBuffering)
+          if (isPlaying || isBuffering) MediaControl.stop else MediaControl.play,
-            MediaControl.stop
-          else
-            MediaControl.play,
         ],
         systemActions: const <MediaAction>{},
-        processingState: isBuffering
+        processingState: isBuffering ? AudioProcessingState.buffering : processingState,
-            ? AudioProcessingState.buffering
-            : processingState,
         playing: isPlaying,
       ),
     );
@@ -231,4 +219,4 @@ class KryzAudioHandler extends BaseAudioHandler with SeekHandler {
       // Keep existing metadata if live-info fetch fails.
     }
   }
-}
+}

lib/main.dart

@@ -5,7 +5,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:timezone/data/latest.dart' as tz;
 import 'app_theme_business_object.dart';
-import 'carplay_bridge.dart';
 import 'casting_business_object.dart';
 import 'live_info_business_object.dart';
 import 'live_info_panel.dart';
@@ -36,20 +35,16 @@ class MyApp extends StatefulWidget {
 class _MyAppState extends State<MyApp> {
   final StreamingAudioBusinessObject _audio = StreamingAudioBusinessObject();
   final CastingBusinessObject _casting = CastingBusinessObject();
-  late final CarPlayBridge _carPlayBridge;
 
   @override
   void initState() {
     super.initState();
-    _carPlayBridge = CarPlayBridge(audio: _audio);
     unawaited(_audio.ensureInitialized());
-    unawaited(_carPlayBridge.start());
     _casting.initialize();
   }
 
   @override
   void dispose() {
-    unawaited(_carPlayBridge.dispose());
     _casting.dispose();
     _audio.dispose();
     super.dispose();
@@ -78,11 +73,12 @@ class MainPage extends StatefulWidget {
   State<MainPage> createState() => _MainPageState();
 }
 
-class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
+class _MainPageState extends State<MainPage> {
   StreamingAudioBusinessObject get _audio => widget.audio;
   CastingBusinessObject get _casting => widget.casting;
   final LiveInfoBusinessObject _liveInfo = LiveInfoBusinessObject();
   static const List<int> _intervalOptions = <int>[5, 10, 15, 30, 60];
+  bool _castStreamStartedForActiveSession = false;
   bool _isStartingCastStream = false;
   bool _pendingRemotePlay = false;
 
@@ -137,33 +133,11 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addObserver(this);
     _audio.addListener(_handleAudioStateChanged);
     _casting.addListener(_handleCastingStateChanged);
     _liveInfo.addListener(_handleLiveInfoChanged);
     _liveInfo.start();
     _playbackChannel.setMethodCallHandler(_handlePlaybackMethodCall);
-
-    // When native code requests local audio to stop (cast media loaded)
-    _casting.onStopLocalAudioRequested = () {
-      unawaited(_audio.stop());
-    };
-  }
-
-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    if (state == AppLifecycleState.resumed) {
-      // Re-initialize (not just refresh) to re-establish the EventChannel
-      // subscription. In a cold-start Android Auto scenario the Flutter engine
-      // boots headlessly before MainActivity.configureFlutterEngine() runs, so
-      // the native EventChannel StreamHandler is not yet registered when
-      // initialize() first fires. The "listen" message is dropped, eventSink
-      // stays null, and all subsequent emitStatus() calls are silently lost.
-      // Calling initialize() here cancels that dead subscription and creates a
-      // fresh one now that the handler is registered; onListen immediately
-      // re-emits statusPayload so the Dart state is fully re-synced.
-      unawaited(_casting.initialize());
-    }
   }
 
   Future<void> _handlePlaybackMethodCall(MethodCall call) async {
@@ -198,27 +172,15 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
   }
 
   void _handleCastingStateChanged() {
-    final currentStatus = _casting.status;
-
-    if (_casting.isPlaying || _casting.isBuffering) {
-      _pendingRemotePlay = false;
-    }
-
-    if (currentStatus != CastingStatus.connected) {
-      _isStartingCastStream = false;
-    }
-
     if (_usesExternalCastPlayback &&
-        _pendingRemotePlay &&
+        (!_castStreamStartedForActiveSession || _pendingRemotePlay) &&
         !_isStartingCastStream) {
-      // Only load when _pendingRemotePlay was set by _play() while connecting.
-      // Do NOT trigger on justConnected — native pendingCastRequest handles
-      // all autoplay from showDevicePicker(autoplay: true).
       _startCastingLiveStream();
     }
 
-    if (!_usesExternalCastPlayback &&
+    if (!_usesExternalCastPlayback) {
-        currentStatus != CastingStatus.connecting) {
+      _castStreamStartedForActiveSession = false;
+      _isStartingCastStream = false;
       _pendingRemotePlay = false;
     }
 
@@ -241,24 +203,21 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
         subtitle: _audio.currentSubtitle,
       );
 
+      _castStreamStartedForActiveSession = true;
       _pendingRemotePlay = false;
 
       if (_usesExternalCastPlayback && !_audio.isStopped) {
         await _audio.stop();
       }
     } catch (_) {
-      _pendingRemotePlay = !_audio.isStopped;
+      _castStreamStartedForActiveSession = false;
+      // State is already updated by the casting business object.
     } finally {
       _isStartingCastStream = false;
     }
   }
 
   Future<void> _play() async {
-    if (_casting.status == CastingStatus.connecting) {
-      _pendingRemotePlay = true;
-      return;
-    }
-
     if (_usesExternalCastPlayback) {
       if (_casting.isPlaying || _isStartingCastStream) {
         return;
@@ -268,7 +227,12 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
       return;
     }
 
-    _pendingRemotePlay = false;
+    if (_usesExternalCastPlayback &&
+        _casting.status == CastingStatus.connecting) {
+      _pendingRemotePlay = true;
+      return;
+    }
+
     await _audio.play();
   }
 
@@ -287,21 +251,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
       return;
     }
 
-    final shouldAutoplay = !_audio.isStopped;
+    await _casting.showDevicePicker();
-    // Do NOT set _pendingRemotePlay when native handles autoplay.
-    // The native pendingCastRequest already handles autoplay via
-    // showDevicePicker(autoplay: true). Setting _pendingRemotePlay here
-    // causes a duplicate load from Flutter that races the native load and
-    // corrupts the cast status (especially in the Android Auto path).
-    // _pendingRemotePlay is only set by _play() when the user explicitly
-    // presses Play while the cast session is still connecting.
-    _pendingRemotePlay = false;
-    await _casting.showDevicePicker(
-      autoplay: shouldAutoplay,
-      streamUrl: shouldAutoplay ? _audio.streamUrl : null,
-      title: shouldAutoplay ? _audio.currentTitle : null,
-      subtitle: shouldAutoplay ? _audio.currentSubtitle : null,
-    );
   }
 
   String _castingLabel() {
@@ -340,7 +290,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
 
   @override
   void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
     _audio.removeListener(_handleAudioStateChanged);
     _casting.removeListener(_handleCastingStateChanged);
     _liveInfo.removeListener(_handleLiveInfoChanged);
@@ -462,7 +411,9 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
                         label: const Text('Stop'),
                       ),
                       ElevatedButton.icon(
-                        onPressed: _casting.status == CastingStatus.connecting
+                        onPressed:
+                            _casting.status == CastingStatus.connecting ||
+                                _casting.status == CastingStatus.unavailable
                             ? null
                             : _toggleCasting,
                         icon: Icon(_castingIcon()),