feat(auto): show album artwork on folder items in Android Auto browser

This commit is contained in:
Sam Mingo authored and birdbird committed 2026-09-23 13:49:14 +00:00
1 parent 1e905b6edb
commit 9802cd6720
1 file changed
+25 -7
@@ -7,6 +7,8 @@
package org.moire.ultrasonic.service
import android.content.ContentResolver
import android.net.Uri
import android.os.Bundle
import androidx.annotation.OptIn
import androidx.car.app.connection.CarConnection
@@ -34,6 +36,7 @@ import com.google.common.collect.ImmutableList
import com.google.common.util.concurrent.Futures
import com.google.common.util.concurrent.ListenableFuture
import com.google.common.util.concurrent.SettableFuture
import java.util.Locale
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
@@ -51,6 +54,7 @@ import org.moire.ultrasonic.domain.MusicDirectory
import org.moire.ultrasonic.domain.SearchCriteria
import org.moire.ultrasonic.domain.SearchResult
import org.moire.ultrasonic.domain.Track
import org.moire.ultrasonic.util.FileUtil
import org.moire.ultrasonic.util.Util
import org.moire.ultrasonic.util.buildMediaItem
import org.moire.ultrasonic.util.toMediaItem
@@ -985,8 +989,8 @@ class MediaLibrarySessionCallback :
albums?.map { album ->
mediaItems.add(
album.title ?: "",
listOf(MEDIA_ALBUM_ITEM, album.id, album.name)
.joinToString("|")
listOf(MEDIA_ALBUM_ITEM, album.id, album.name).joinToString("|"),
imageUri = album.toArtworkUri()
)
}
return@future LibraryResult.ofItemList(mediaItems, null)
@@ -1026,7 +1030,8 @@ class MediaLibrarySessionCallback :
if (item.isDirectory) {
mediaItems.add(
item.title ?: "",
listOf(MEDIA_ALBUM_ITEM, item.id, item.name).joinToString("|")
listOf(MEDIA_ALBUM_ITEM, item.id, item.name).joinToString("|"),
imageUri = item.toArtworkUri()
)
} else if (item is Track) {
mediaItems.add(
@@ -1082,8 +1087,8 @@ class MediaLibrarySessionCallback :
albums?.map { album ->
mediaItems.add(
album.title ?: "",
listOf(MEDIA_ALBUM_ITEM, album.id, album.name)
.joinToString("|")
listOf(MEDIA_ALBUM_ITEM, album.id, album.name).joinToString("|"),
imageUri = album.toArtworkUri()
)
}
@@ -1485,18 +1490,31 @@ class MediaLibrarySessionCallback :
}
}.get()
private fun MusicDirectory.Child.toArtworkUri(): Uri? {
if (coverArt.isNullOrBlank()) return null
val key = FileUtil.getAlbumArtKey(this, true) ?: return null
val domain = UApp.applicationContext().packageName + ".provider.AlbumArtContentProvider"
return Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(domain)
.path(String.format(Locale.ROOT, "%s|%s", coverArt, key))
.build()
}
private fun MutableList<MediaItem>.add(
title: String,
mediaId: String,
mediaType: Int = MEDIA_TYPE_MIXED,
isBrowsable: Boolean = false
isBrowsable: Boolean = false,
imageUri: Uri? = null
) {
val mediaItem = buildMediaItem(
title,
mediaId,
isPlayable = false,
isBrowsable = isBrowsable,
mediaType = mediaType
mediaType = mediaType,
imageUri = imageUri
)
this.add(mediaItem)