From 2cc21c9f309d08854e08e7fde6c7b94b89737ad7 Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Fri, 30 Oct 2026 14:53:29 -0400 Subject: [PATCH] fix(mobile): forward Android media session timeline callbacks --- patches/expo-audio@58.0.10.patch | 134 +++++++++++++++++++++++++++++++ pnpm-lock.yaml | 6 +- 2 files changed, 137 insertions(+), 3 deletions(-) diff --git a/patches/expo-audio@58.0.10.patch b/patches/expo-audio@58.0.10.patch index 3e4ffb3..aa0eb41 100644 --- a/patches/expo-audio@58.0.10.patch +++ b/patches/expo-audio@58.0.10.patch @@ -191,3 +191,137 @@ diff --git a/android/src/main/java/expo/modules/audio/AudioModule.kt b/android/s releaseAudioFocusIfUnused() } } +diff --git a/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt b/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt +--- a/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt ++++ b/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt +@@ -1,5 +1,14 @@ + package expo.modules.audio.service + ++import androidx.media3.common.AudioAttributes ++import androidx.media3.common.DeviceInfo ++import androidx.media3.common.MediaItem ++import androidx.media3.common.PlaybackException ++import androidx.media3.common.PlaybackParameters ++import androidx.media3.common.Timeline ++import androidx.media3.common.TrackSelectionParameters ++import androidx.media3.common.Tracks ++import androidx.media3.common.VideoSize + import android.os.Handler + import android.os.Looper + import androidx.core.net.toUri +@@ -81,7 +90,114 @@ + + private inner class MetadataForwardingListener( + private val listener: Player.Listener +- ) : Player.Listener by listener { ++ ) : Player.Listener { ++ // Kotlin delegation does not forward Java default methods on Player.Listener. ++ // Forward each callback so MediaSession receives timeline and duration changes. ++ override fun onTimelineChanged(timeline: Timeline, reason: Int) = ++ listener.onTimelineChanged(timeline, reason) ++ ++ override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) = ++ listener.onMediaItemTransition(mediaItem, reason) ++ ++ override fun onTracksChanged(tracks: Tracks) = ++ listener.onTracksChanged(tracks) ++ ++ override fun onPlaylistMetadataChanged(mediaMetadata: MediaMetadata) = ++ listener.onPlaylistMetadataChanged(mediaMetadata) ++ ++ override fun onIsLoadingChanged(isLoading: Boolean) = ++ listener.onIsLoadingChanged(isLoading) ++ ++ override fun onLoadingChanged(isLoading: Boolean) = ++ listener.onLoadingChanged(isLoading) ++ ++ override fun onAvailableCommandsChanged(availableCommands: Player.Commands) = ++ listener.onAvailableCommandsChanged(availableCommands) ++ ++ override fun onTrackSelectionParametersChanged(parameters: TrackSelectionParameters) = ++ listener.onTrackSelectionParametersChanged(parameters) ++ ++ override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) = ++ listener.onPlayerStateChanged(playWhenReady, playbackState) ++ ++ override fun onPlaybackStateChanged(playbackState: Int) = ++ listener.onPlaybackStateChanged(playbackState) ++ ++ override fun onPlayWhenReadyChanged(playWhenReady: Boolean, reason: Int) = ++ listener.onPlayWhenReadyChanged(playWhenReady, reason) ++ ++ override fun onPlaybackSuppressionReasonChanged(playbackSuppressionReason: Int) = ++ listener.onPlaybackSuppressionReasonChanged(playbackSuppressionReason) ++ ++ override fun onIsPlayingChanged(isPlaying: Boolean) = ++ listener.onIsPlayingChanged(isPlaying) ++ ++ override fun onRepeatModeChanged(repeatMode: Int) = ++ listener.onRepeatModeChanged(repeatMode) ++ ++ override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) = ++ listener.onShuffleModeEnabledChanged(shuffleModeEnabled) ++ ++ override fun onPlayerError(error: PlaybackException) = ++ listener.onPlayerError(error) ++ ++ override fun onPlayerErrorChanged(error: PlaybackException?) = ++ listener.onPlayerErrorChanged(error) ++ ++ override fun onPositionDiscontinuity(reason: Int) = ++ listener.onPositionDiscontinuity(reason) ++ ++ override fun onPositionDiscontinuity(oldPosition: Player.PositionInfo, newPosition: Player.PositionInfo, reason: Int) = ++ listener.onPositionDiscontinuity(oldPosition, newPosition, reason) ++ ++ override fun onPlaybackParametersChanged(playbackParameters: PlaybackParameters) = ++ listener.onPlaybackParametersChanged(playbackParameters) ++ ++ override fun onSeekBackIncrementChanged(seekBackIncrementMs: Long) = ++ listener.onSeekBackIncrementChanged(seekBackIncrementMs) ++ ++ override fun onSeekForwardIncrementChanged(seekForwardIncrementMs: Long) = ++ listener.onSeekForwardIncrementChanged(seekForwardIncrementMs) ++ ++ override fun onMaxSeekToPreviousPositionChanged(maxSeekToPreviousPositionMs: Long) = ++ listener.onMaxSeekToPreviousPositionChanged(maxSeekToPreviousPositionMs) ++ ++ override fun onAudioSessionIdChanged(audioSessionId: Int) = ++ listener.onAudioSessionIdChanged(audioSessionId) ++ ++ override fun onAudioAttributesChanged(audioAttributes: AudioAttributes) = ++ listener.onAudioAttributesChanged(audioAttributes) ++ ++ override fun onVolumeChanged(volume: Float) = ++ listener.onVolumeChanged(volume) ++ ++ override fun onSkipSilenceEnabledChanged(skipSilenceEnabled: Boolean) = ++ listener.onSkipSilenceEnabledChanged(skipSilenceEnabled) ++ ++ override fun onDeviceInfoChanged(deviceInfo: DeviceInfo) = ++ listener.onDeviceInfoChanged(deviceInfo) ++ ++ override fun onDeviceVolumeChanged(volume: Int, muted: Boolean) = ++ listener.onDeviceVolumeChanged(volume, muted) ++ ++ override fun onVideoSizeChanged(videoSize: VideoSize) = ++ listener.onVideoSizeChanged(videoSize) ++ ++ override fun onSurfaceSizeChanged(width: Int, height: Int) = ++ listener.onSurfaceSizeChanged(width, height) ++ ++ override fun onRenderedFirstFrame() = ++ listener.onRenderedFirstFrame() ++ ++ override fun onCues(cues: List) = ++ listener.onCues(cues) ++ ++ override fun onCues(cueGroup: androidx.media3.common.text.CueGroup) = ++ listener.onCues(cueGroup) ++ ++ override fun onMetadata(metadata: androidx.media3.common.Metadata) = ++ listener.onMetadata(metadata) ++ + override fun onMediaMetadataChanged(mediaMetadata: MediaMetadata) { + listener.onMediaMetadataChanged(this@MetadataInjectingPlayer.mediaMetadata) + } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d6ddf8c..c58b0e2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: patchedDependencies: expo-audio@58.0.10: - hash: d311b49a926e08d51cf3bc733a6e1685aa90ab921bc74162f8fdfa26c0ee03c5 + hash: f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5 path: patches/expo-audio@58.0.10.patch importers: @@ -63,7 +63,7 @@ importers: version: 58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3) expo-audio: specifier: ~58.0.10 - version: 58.0.10(patch_hash=d311b49a926e08d51cf3bc733a6e1685aa90ab921bc74162f8fdfa26c0ee03c5)(expo-asset@58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3))(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0) + version: 58.0.10(patch_hash=f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5)(expo-asset@58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3))(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0) expo-blur: specifier: ~58.0.5 version: 58.0.5(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0) @@ -11073,7 +11073,7 @@ snapshots: - supports-color - typescript - expo-audio@58.0.10(patch_hash=d311b49a926e08d51cf3bc733a6e1685aa90ab921bc74162f8fdfa26c0ee03c5)(expo-asset@58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3))(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0): + expo-audio@58.0.10(patch_hash=f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5)(expo-asset@58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3))(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0): dependencies: expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3) expo-asset: 58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)