Skip to content

Fix thumbnails appearing on Android Auto even if disabled #12410

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
Stypox merged 2 commits into from
Jul 8, 2025
Merged

Fix thumbnails appearing on Android Auto even if disabled #12410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
834c93f
Fix thumbnails appearing on Android Auto even if disabled
Stypox Jul 6, 2025
a4d457b
Use Kotlin's .toUri() instead of Uri.parse()
Stypox Jul 6, 2025
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
21 changes: 15 additions & 6 deletions app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.support.v4.media.MediaBrowserCompat
import android.support.v4.media.MediaDescriptionCompat
import android.util.Log
import androidx.annotation.DrawableRes
import androidx.core.net.toUri
import androidx.media.MediaBrowserServiceCompat
import androidx.media.MediaBrowserServiceCompat.Result
import androidx.media.utils.MediaConstants
Expand Down Expand Up @@ -103,7 +104,7 @@ class MediaBrowserImpl(

private fun onLoadChildren(parentId: String): Single<List<MediaBrowserCompat.MediaItem>> {
try {
val parentIdUri = Uri.parse(parentId)
val parentIdUri = parentId.toUri()
val path = ArrayList(parentIdUri.pathSegments)

if (path.isEmpty()) {
Expand Down Expand Up @@ -185,7 +186,7 @@ class MediaBrowserImpl(
builder
.setMediaId(createMediaIdForInfoItem(playlist is PlaylistRemoteEntity, playlist.uid))
.setTitle(playlist.orderingName)
.setIconUri(playlist.thumbnailUrl?.let { Uri.parse(it) })
.setIconUri(imageUriOrNullIfDisabled(playlist.thumbnailUrl))

val extras = Bundle()
extras.putString(
Expand All @@ -212,7 +213,7 @@ class MediaBrowserImpl(
}

ImageStrategy.choosePreferredImage(item.thumbnails)?.let {
builder.setIconUri(Uri.parse(it))
builder.setIconUri(imageUriOrNullIfDisabled(it))
}

return MediaBrowserCompat.MediaItem(
Expand Down Expand Up @@ -258,7 +259,7 @@ class MediaBrowserImpl(
builder.setMediaId(createMediaIdForPlaylistIndex(false, playlistId, index))
.setTitle(item.streamEntity.title)
.setSubtitle(item.streamEntity.uploader)
.setIconUri(Uri.parse(item.streamEntity.thumbnailUrl))
.setIconUri(imageUriOrNullIfDisabled(item.streamEntity.thumbnailUrl))

return MediaBrowserCompat.MediaItem(
builder.build(),
Expand All @@ -277,7 +278,7 @@ class MediaBrowserImpl(
.setSubtitle(item.uploaderName)

ImageStrategy.choosePreferredImage(item.thumbnails)?.let {
builder.setIconUri(Uri.parse(it))
builder.setIconUri(imageUriOrNullIfDisabled(it))
}

return MediaBrowserCompat.MediaItem(
Expand Down Expand Up @@ -316,7 +317,7 @@ class MediaBrowserImpl(
builder.setMediaId(mediaId)
.setTitle(streamHistoryEntry.streamEntity.title)
.setSubtitle(streamHistoryEntry.streamEntity.uploader)
.setIconUri(Uri.parse(streamHistoryEntry.streamEntity.thumbnailUrl))
.setIconUri(imageUriOrNullIfDisabled(streamHistoryEntry.streamEntity.thumbnailUrl))

return MediaBrowserCompat.MediaItem(
builder.build(),
Expand Down Expand Up @@ -395,5 +396,13 @@ class MediaBrowserImpl(

companion object {
private val TAG: String = MediaBrowserImpl::class.java.getSimpleName()

fun imageUriOrNullIfDisabled(url: String?): Uri? {
return if (ImageStrategy.shouldLoadImages()) {
url?.toUri()
} else {
null
}
}
}
}
3 changes: 2 additions & 1 deletion app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import android.os.Bundle
import android.os.ResultReceiver
import android.support.v4.media.session.PlaybackStateCompat
import android.util.Log
import androidx.core.net.toUri
import com.google.android.exoplayer2.Player
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector.PlaybackPreparer
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
Expand Down Expand Up @@ -137,7 +138,7 @@ class MediaBrowserPlaybackPreparer(

private fun extractPlayQueueFromMediaId(mediaId: String): Single<PlayQueue> {
try {
val mediaIdUri = Uri.parse(mediaId)
val mediaIdUri = mediaId.toUri()
val path = ArrayList(mediaIdUri.pathSegments)
if (path.isEmpty()) {
throw parseError(mediaId)
Expand Down