Check for the correct media id when ensuring the MediaPlayer is ready (#1783)

Marco Romano · web-flow · commit 2f51919670e5 · 2023-11-10T09:45:29.000Z
Just forgot to add this further condition.
diff --git a/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/MediaPlayerImpl.kt b/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/MediaPlayerImpl.kt
@@ -116,7 +116,7 @@ class MediaPlayerImpl @Inject constructor(
         )
         player.prepare()
         // Will throw TimeoutCancellationException if the player is not ready after 1 second.
-        return state.timeout(1.seconds).first { it.isReady }
+        return state.timeout(1.seconds).first { it.isReady && it.mediaId == mediaId }
     }
 
     override fun play() {

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ class MediaPlayerImpl @Inject constructor(`
`116`	`116`	`)`
`117`	`117`	`player.prepare()`
`118`	`118`	`// Will throw TimeoutCancellationException if the player is not ready after 1 second.`
`119`		`- return state.timeout(1.seconds).first { it.isReady }`
	`119`	`+ return state.timeout(1.seconds).first { it.isReady && it.mediaId == mediaId }`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`override fun play() {`