Check for Player.COMMAND_GET_CURRENT_MEDIA_ITEM before getting the current media URI

Author: MGaetan89

libraries/ui_compose/src/main/java/androidx/media3/ui/compose/state/MetadataState.kt

@@ -48,18 +48,27 @@ fun rememberMetadataState(player: Player): MetadataState {
  */
 @UnstableApi
 class MetadataState(private val player: Player) {
-  var uri by mutableStateOf(player.getMediaItemUri())
+  var uri by mutableStateOf(player.getMediaItemUriWithCommandCheck())
     private set
 
   suspend fun observe(): Nothing {
     player.listen { events ->
-      if (events.contains(Player.EVENT_MEDIA_ITEM_TRANSITION)) {
-        uri = getMediaItemUri()
+      if (
+          events.containsAny(
+            Player.EVENT_AVAILABLE_COMMANDS_CHANGED,
+            Player.EVENT_MEDIA_ITEM_TRANSITION,
+          )
+      ) {
+        uri = getMediaItemUriWithCommandCheck()
       }
     }
   }
 
-  private fun Player.getMediaItemUri(): Uri? {
-    return currentMediaItem?.localConfiguration?.uri
+  private fun Player.getMediaItemUriWithCommandCheck(): Uri? {
+    return if (isCommandAvailable(Player.COMMAND_GET_CURRENT_MEDIA_ITEM)) {
+      currentMediaItem?.localConfiguration?.uri
+    } else {
+      null
+    }
   }
 }

libraries/ui_compose/src/test/java/androidx/media3/ui/compose/state/MetadataStateTest.kt

@@ -105,4 +105,25 @@ class MetadataStateTest {
 
     assertThat(state.uri).isEqualTo(uri2)
   }
+
+  @Test
+  fun uri_getCurrentMediaItemCommandBecomesAvailable_returnsUpdatedUri() {
+    val uri = "https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd".toUri()
+    val player = TestPlayer(
+      playlist = listOf(
+        MediaItemData.Builder("uid_1").setMediaItem(MediaItem.fromUri(uri)).build(),
+      ),
+    )
+    player.removeCommands(Player.COMMAND_GET_CURRENT_MEDIA_ITEM)
+
+    lateinit var state: MetadataState
+    composeTestRule.setContent { state = rememberMetadataState(player) }
+
+    assertThat(state.uri).isNull()
+
+    player.addCommands(Player.COMMAND_GET_CURRENT_MEDIA_ITEM)
+    composeTestRule.waitForIdle()
+
+    assertThat(state.uri).isEqualTo(uri)
+  }
 }

libraries/ui_compose/src/test/java/androidx/media3/ui/compose/utils/TestPlayer.kt

@@ -172,7 +172,7 @@ internal class TestPlayer(
 
   fun setDuration(uid: String, durationMs: Long) {
     val index = state.playlist.indexOfFirst { it.uid == uid }
-    require(index > -1) { "Playlist does not contain item with uid: $uid" }
+    require(index >= 0) { "Playlist does not contain item with uid: $uid" }
     val modifiedPlaylist = buildList {
       addAll(state.playlist)
       set(index, state.playlist[index].buildUpon().setDurationUs(msToUs(durationMs)).build())