Skip to content

Optimize artwork loading and update URI authority checks #2303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theovilardo merged 1 commit into from
Jun 9, 2026
Merged

Optimize artwork loading and update URI authority checks #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/src/main/java/com/theveloper/pixelplay/data/service/MusicService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2664,9 +2664,13 @@ class MusicService : MediaLibraryService() {
if (targetPackage.isBlank()) return

val providerAuthority = "$packageName.provider"
val artworkAuthority = "$packageName.artwork"
mediaItems.forEach { mediaItem ->
val artworkUri = resolveArtworkUri(mediaItem.mediaMetadata) ?: return@forEach
if (artworkUri.scheme?.lowercase() != "content" || artworkUri.authority != providerAuthority) {
val authority = artworkUri.authority
if (artworkUri.scheme?.lowercase() != "content" ||
(authority != providerAuthority && authority != artworkAuthority)
) {
return@forEach
}

Expand Down
12 changes: 0 additions & 12 deletions app/src/main/java/com/theveloper/pixelplay/utils/MediaItemBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ import androidx.media3.common.MediaMetadata.PICTURE_TYPE_FRONT_COVER
import androidx.media3.common.util.UnstableApi
import com.theveloper.pixelplay.data.provider.SharedArtworkContentProvider
import com.theveloper.pixelplay.data.model.Song
import com.theveloper.pixelplay.data.service.loadArtworkBytesViaCoil
import java.io.File
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking

object MediaItemBuilder {
private const val EXTERNAL_MEDIA_ID_PREFIX = "external:"
Expand Down Expand Up @@ -123,7 +120,6 @@ object MediaItemBuilder {
.setMediaMetadata(
buildMediaMetadataForSong(
song = song,
context = context,
exposedArtworkUri = externalControllerArtworkUri(context, song.albumArtUriString)
)
)
Expand Down Expand Up @@ -276,7 +272,6 @@ object MediaItemBuilder {
@OptIn(UnstableApi::class)
private fun buildMediaMetadataForSong(
song: Song,
context: Context? = null,
exposedArtworkUri: Uri? = artworkUri(song.albumArtUriString)
): MediaMetadata {
val metadataBuilder = MediaMetadata.Builder()
Expand All @@ -286,13 +281,6 @@ object MediaItemBuilder {

exposedArtworkUri?.let { artworkUri ->
metadataBuilder.setArtworkUri(artworkUri)
context?.let { appContext ->
runBlocking(Dispatchers.IO) {
loadArtworkBytesViaCoil(appContext, artworkUri)
}?.let { artworkData ->
metadataBuilder.setArtworkData(artworkData, PICTURE_TYPE_FRONT_COVER)
}
}
}

val extras = Bundle().apply {
Expand Down
Loading