Only set mediaId on MediaItems in media controller

This makes the media controller more responsive, see androidx/media#81

Author: naveensingh

app/src/main/kotlin/com/simplemobiletools/musicplayer/extensions/Player.kt

@@ -7,7 +7,7 @@ import androidx.media3.common.Player
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.musicplayer.helpers.PlaybackSetting
 import com.simplemobiletools.musicplayer.models.Track
-import com.simplemobiletools.musicplayer.models.toMediaItems
+import com.simplemobiletools.musicplayer.models.toMediaItemsFast
 
 val Player.isReallyPlaying: Boolean
     get() = when (playbackState) {
@@ -149,7 +149,7 @@ fun Player.prepareUsingTracks(
         return
     }
 
-    val mediaItems = tracks.toMediaItems()
+    val mediaItems = tracks.toMediaItemsFast()
     runOnPlayerThread {
         setMediaItems(mediaItems, startIndex, startPositionMs)
         playWhenReady = play
@@ -179,7 +179,7 @@ inline fun Player.maybePreparePlayer(context: Context, crossinline callback: (su
                         return@getQueuedTracksLazily
                     }
 
-                    addRemainingMediaItems(tracks.toMediaItems(), startIndex)
+                    addRemainingMediaItems(tracks.toMediaItemsFast(), startIndex)
                 }
             }
         }

app/src/main/kotlin/com/simplemobiletools/musicplayer/models/Track.kt

@@ -3,6 +3,7 @@ package com.simplemobiletools.musicplayer.models
 import android.content.ContentUris
 import android.net.Uri
 import android.provider.MediaStore
+import androidx.media3.common.MediaItem
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
@@ -101,3 +102,9 @@ data class Track(
 fun ArrayList<Track>.sortSafely(sorting: Int) = sortSafely(Track.getComparator(sorting))
 
 fun Collection<Track>.toMediaItems() = map { it.toMediaItem() }
+
+fun Collection<Track>.toMediaItemsFast() = map {
+    MediaItem.Builder()
+        .setMediaId(it.mediaStoreId.toString())
+        .build()
+}

app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/MediaSessionCallback.kt

@@ -166,52 +166,44 @@ internal fun PlaybackService.getMediaSessionCallback() = object : MediaLibrarySe
         mediaItems: MutableList<MediaItem>,
         startIndex: Int,
         startPositionMs: Long
-    ) = if (controller.packageName == packageName) {
-        Futures.immediateFuture(MediaSession.MediaItemsWithStartPosition(mediaItems, startIndex, startPositionMs))
-    } else {
-        callWhenSourceReady {
-            // this is to avoid single items in the queue: https://github.com/androidx/media/issues/156
-            var queueItems = mediaItems
-            val startItemId = mediaItems[0].mediaId
-            val currentItems = mediaItemProvider.getChildren(currentRoot).orEmpty()
+    ): ListenableFuture<MediaSession.MediaItemsWithStartPosition> {
+        if (controller.packageName == packageName) {
+            return super.onSetMediaItems(mediaSession, controller, mediaItems, startIndex, startPositionMs)
+        }
 
-            queueItems = if (currentItems.any { it.mediaId == startItemId }) {
-                currentItems.toMutableList()
-            } else {
-                mediaItemProvider.getDefaultQueue()?.toMutableList() ?: queueItems
-            }
+        // this is to avoid single items in the queue: https://github.com/androidx/media/issues/156
+        var queueItems = mediaItems
+        val startItemId = mediaItems[0].mediaId
+        val currentItems = mediaItemProvider.getChildren(currentRoot).orEmpty()
 
-            val startItemIndex = queueItems.indexOfFirst { it.mediaId == startItemId }
-            super.onSetMediaItems(mediaSession, controller, queueItems, startItemIndex, startPositionMs).get()
+        queueItems = if (currentItems.any { it.mediaId == startItemId }) {
+            currentItems.toMutableList()
+        } else {
+            mediaItemProvider.getDefaultQueue()?.toMutableList() ?: queueItems
         }
+
+        val startItemIndex = queueItems.indexOfFirst { it.mediaId == startItemId }
+        return super.onSetMediaItems(mediaSession, controller, queueItems, startItemIndex, startPositionMs)
     }
 
     override fun onAddMediaItems(
         mediaSession: MediaSession,
         controller: MediaSession.ControllerInfo,
         mediaItems: List<MediaItem>
-    ) = if (controller.packageName == packageName) {
-        Futures.immediateFuture(mediaItems)
-    } else {
-        callWhenSourceReady {
-            mediaItems.map { mediaItem ->
-                if (mediaItem.requestMetadata.searchQuery != null) {
-                    getMediaItemFromSearchQuery(mediaItem.requestMetadata.searchQuery!!)
-                } else {
-                    mediaItemProvider[mediaItem.mediaId] ?: mediaItem
-                }
+    ): ListenableFuture<List<MediaItem>> {
+        val items = mediaItems.map { mediaItem ->
+            if (mediaItem.requestMetadata.searchQuery != null) {
+                getMediaItemFromSearchQuery(mediaItem.requestMetadata.searchQuery!!)
+            } else {
+                mediaItemProvider[mediaItem.mediaId] ?: mediaItem
             }
         }
+
+        return Futures.immediateFuture(items)
     }
 
     private fun getMediaItemFromSearchQuery(query: String): MediaItem {
-        val searchQuery = if (query.startsWith("play ", ignoreCase = true)) {
-            query.drop(5).lowercase()
-        } else {
-            query.lowercase()
-        }
-
-        return mediaItemProvider.getItemFromSearch(searchQuery) ?: mediaItemProvider.getRandomItem()
+        return mediaItemProvider.getItemFromSearch(query.lowercase()) ?: mediaItemProvider.getRandomItem()
     }
 
     private fun reloadContent() {

app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/library/MediaItemProvider.kt

@@ -89,7 +89,16 @@ internal class MediaItemProvider(private val context: Context) {
         }
     }
 
-    operator fun get(mediaId: String) = getNode(mediaId)?.item
+    operator fun get(mediaId: String): MediaItem? {
+        val mediaItem = getNode(mediaId)?.item
+        if (mediaItem == null) {
+            // assume it's a track
+            val mediaStoreId = mediaId.toLongOrNull() ?: return null
+            return audioHelper.getTrack(mediaStoreId)?.toMediaItem()
+        }
+
+        return mediaItem
+    }
 
     fun getRootItem() = get(SMP_ROOT_ID)!!