Update:Android auto include explicit indicator #611

This commit is contained in:
advplyr
2023-09-12 17:14:28 -05:00
parent 259c9cef20
commit 60da6093f3
4 changed files with 16 additions and 7 deletions
@@ -24,7 +24,7 @@ open class MediaType(var metadata:MediaTypeMetadata, var coverPath:String?) {
@JsonIgnore @JsonIgnore
open fun removeAudioTrack(localFileId:String) { } open fun removeAudioTrack(localFileId:String) { }
@JsonIgnore @JsonIgnore
open fun getLocalCopy():MediaType { return MediaType(MediaTypeMetadata(""),null) } open fun getLocalCopy():MediaType { return MediaType(MediaTypeMetadata("", false),null) }
} }
@@ -190,7 +190,7 @@ class Book(
JsonSubTypes.Type(BookMetadata::class), JsonSubTypes.Type(BookMetadata::class),
JsonSubTypes.Type(PodcastMetadata::class) JsonSubTypes.Type(PodcastMetadata::class)
) )
open class MediaTypeMetadata(var title:String) { open class MediaTypeMetadata(var title:String, var explicit:Boolean) {
@JsonIgnore @JsonIgnore
open fun getAuthorDisplayName():String { return "Unknown" } open fun getAuthorDisplayName():String { return "Unknown" }
} }
@@ -209,13 +209,13 @@ class BookMetadata(
var isbn:String?, var isbn:String?,
var asin:String?, var asin:String?,
var language:String?, var language:String?,
var explicit:Boolean, explicit:Boolean,
// In toJSONExpanded // In toJSONExpanded
var authorName:String?, var authorName:String?,
var authorNameLF:String?, var authorNameLF:String?,
var narratorName:String?, var narratorName:String?,
var seriesName:String? var seriesName:String?
) : MediaTypeMetadata(title) { ) : MediaTypeMetadata(title, explicit) {
@JsonIgnore @JsonIgnore
override fun getAuthorDisplayName():String { return authorName ?: "Unknown" } override fun getAuthorDisplayName():String { return authorName ?: "Unknown" }
} }
@@ -225,8 +225,9 @@ class PodcastMetadata(
title:String, title:String,
var author:String?, var author:String?,
var feedUrl:String?, var feedUrl:String?,
var genres:MutableList<String> var genres:MutableList<String>,
) : MediaTypeMetadata(title) { explicit:Boolean
) : MediaTypeMetadata(title, explicit) {
@JsonIgnore @JsonIgnore
override fun getAuthorDisplayName():String { return author ?: "Unknown" } override fun getAuthorDisplayName():String { return author ?: "Unknown" }
} }
@@ -90,6 +90,10 @@ class LibraryItem(
) )
} }
if (media.metadata.explicit) {
extras.putLong(MediaConstants.METADATA_KEY_IS_EXPLICIT, MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT)
}
val mediaId = localLibraryItemId ?: id val mediaId = localLibraryItemId ?: id
return MediaDescriptionCompat.Builder() return MediaDescriptionCompat.Builder()
.setMediaId(mediaId) .setMediaId(mediaId)
@@ -152,6 +152,10 @@ class LocalLibraryItem(
) )
} }
if (media.metadata.explicit) {
extras.putLong(MediaConstants.METADATA_KEY_IS_EXPLICIT, MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT)
}
val mediaDescriptionBuilder = MediaDescriptionCompat.Builder() val mediaDescriptionBuilder = MediaDescriptionCompat.Builder()
.setMediaId(id) .setMediaId(id)
.setTitle(title) .setTitle(title)
@@ -43,7 +43,7 @@ data class LocalMediaItem(
return if (mediaType == "book") { return if (mediaType == "book") {
BookMetadata(name,null, mutableListOf(), mutableListOf(), mutableListOf(),null,null,null,null,null,null,null,false,null,null,null,null) BookMetadata(name,null, mutableListOf(), mutableListOf(), mutableListOf(),null,null,null,null,null,null,null,false,null,null,null,null)
} else { } else {
PodcastMetadata(name,null,null, mutableListOf()) PodcastMetadata(name,null,null, mutableListOf(), false)
} }
} }