mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-10-31 15:23:00 +00:00
Code Issues Releases Wiki Activity

Fix thumbnails appearing on Android Auto even if disabled

Browse Source
This commit is contained in:
Stypox
2025-07-06 14:49:09 +02:00
parent 2dd11f70a3
commit 834c93f22a
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserImpl.kt
View File

@@ -8,6 +8,7 @@ import android.support.v4.media.MediaBrowserCompat
import android.support.v4.media.MediaDescriptionCompat import android.support.v4.media.MediaDescriptionCompat
import android.util.Log import android.util.Log
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.core.net.toUri
import androidx.media.MediaBrowserServiceCompat import androidx.media.MediaBrowserServiceCompat
import androidx.media.MediaBrowserServiceCompat.Result import androidx.media.MediaBrowserServiceCompat.Result
import androidx.media.utils.MediaConstants import androidx.media.utils.MediaConstants
@@ -185,7 +186,7 @@ class MediaBrowserImpl(
builder builder
.setMediaId(createMediaIdForInfoItem(playlist is PlaylistRemoteEntity, playlist.uid)) .setMediaId(createMediaIdForInfoItem(playlist is PlaylistRemoteEntity, playlist.uid))
.setTitle(playlist.orderingName) .setTitle(playlist.orderingName)
.setIconUri(playlist.thumbnailUrl?.let { Uri.parse(it) }) .setIconUri(imageUriOrNullIfDisabled(playlist.thumbnailUrl))
val extras = Bundle() val extras = Bundle()
extras.putString( extras.putString(
@@ -212,7 +213,7 @@ class MediaBrowserImpl(
} }
ImageStrategy.choosePreferredImage(item.thumbnails)?.let { ImageStrategy.choosePreferredImage(item.thumbnails)?.let {
builder.setIconUri(Uri.parse(it)) builder.setIconUri(imageUriOrNullIfDisabled(it))
} }
return MediaBrowserCompat.MediaItem( return MediaBrowserCompat.MediaItem(
@@ -258,7 +259,7 @@ class MediaBrowserImpl(
builder.setMediaId(createMediaIdForPlaylistIndex(false, playlistId, index)) builder.setMediaId(createMediaIdForPlaylistIndex(false, playlistId, index))
.setTitle(item.streamEntity.title) .setTitle(item.streamEntity.title)
.setSubtitle(item.streamEntity.uploader) .setSubtitle(item.streamEntity.uploader)
.setIconUri(Uri.parse(item.streamEntity.thumbnailUrl)) .setIconUri(imageUriOrNullIfDisabled(item.streamEntity.thumbnailUrl))
return MediaBrowserCompat.MediaItem( return MediaBrowserCompat.MediaItem(
builder.build(), builder.build(),
@@ -277,7 +278,7 @@ class MediaBrowserImpl(
.setSubtitle(item.uploaderName) .setSubtitle(item.uploaderName)
ImageStrategy.choosePreferredImage(item.thumbnails)?.let { ImageStrategy.choosePreferredImage(item.thumbnails)?.let {
builder.setIconUri(Uri.parse(it)) builder.setIconUri(imageUriOrNullIfDisabled(it))
} }
return MediaBrowserCompat.MediaItem( return MediaBrowserCompat.MediaItem(
@@ -316,7 +317,7 @@ class MediaBrowserImpl(
builder.setMediaId(mediaId) builder.setMediaId(mediaId)
.setTitle(streamHistoryEntry.streamEntity.title) .setTitle(streamHistoryEntry.streamEntity.title)
.setSubtitle(streamHistoryEntry.streamEntity.uploader) .setSubtitle(streamHistoryEntry.streamEntity.uploader)
.setIconUri(Uri.parse(streamHistoryEntry.streamEntity.thumbnailUrl)) .setIconUri(imageUriOrNullIfDisabled(streamHistoryEntry.streamEntity.thumbnailUrl))
return MediaBrowserCompat.MediaItem( return MediaBrowserCompat.MediaItem(
builder.build(), builder.build(),
@@ -395,5 +396,13 @@ class MediaBrowserImpl(
companion object { companion object {
private val TAG: String = MediaBrowserImpl::class.java.getSimpleName() private val TAG: String = MediaBrowserImpl::class.java.getSimpleName()
fun imageUriOrNullIfDisabled(url: String?): Uri? {
return if (ImageStrategy.shouldLoadImages()) {
url?.toUri()
} else {
null
}
}
} }
} }