mirror of
https://github.com/samsonjs/media.git
synced 2026-04-27 15:07:40 +00:00
Remove MediaMetadata.mediaUrl
This value only existed to allow setting media URLs from external sources (e.g. in a MediaController) so that a player can start playing this item. Now that we have MediaItem.RequestMetadata.mediaUrl we can remove this value from MediaMetadata because it's request metadata, not media metadata. PiperOrigin-RevId: 451857413
This commit is contained in:
parent
38248af5cf
commit
8e015c4f91
2 changed files with 0 additions and 20 deletions
|
|
@ -52,7 +52,6 @@ public final class MediaMetadata implements Bundleable {
|
||||||
@Nullable private CharSequence displayTitle;
|
@Nullable private CharSequence displayTitle;
|
||||||
@Nullable private CharSequence subtitle;
|
@Nullable private CharSequence subtitle;
|
||||||
@Nullable private CharSequence description;
|
@Nullable private CharSequence description;
|
||||||
@Nullable private Uri mediaUri;
|
|
||||||
@Nullable private Rating userRating;
|
@Nullable private Rating userRating;
|
||||||
@Nullable private Rating overallRating;
|
@Nullable private Rating overallRating;
|
||||||
@Nullable private byte[] artworkData;
|
@Nullable private byte[] artworkData;
|
||||||
|
|
@ -88,7 +87,6 @@ public final class MediaMetadata implements Bundleable {
|
||||||
this.displayTitle = mediaMetadata.displayTitle;
|
this.displayTitle = mediaMetadata.displayTitle;
|
||||||
this.subtitle = mediaMetadata.subtitle;
|
this.subtitle = mediaMetadata.subtitle;
|
||||||
this.description = mediaMetadata.description;
|
this.description = mediaMetadata.description;
|
||||||
this.mediaUri = mediaMetadata.mediaUri;
|
|
||||||
this.userRating = mediaMetadata.userRating;
|
this.userRating = mediaMetadata.userRating;
|
||||||
this.overallRating = mediaMetadata.overallRating;
|
this.overallRating = mediaMetadata.overallRating;
|
||||||
this.artworkData = mediaMetadata.artworkData;
|
this.artworkData = mediaMetadata.artworkData;
|
||||||
|
|
@ -161,12 +159,6 @@ public final class MediaMetadata implements Bundleable {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Sets the media {@link Uri}. */
|
|
||||||
public Builder setMediaUri(@Nullable Uri mediaUri) {
|
|
||||||
this.mediaUri = mediaUri;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Sets the user {@link Rating}. */
|
/** Sets the user {@link Rating}. */
|
||||||
public Builder setUserRating(@Nullable Rating userRating) {
|
public Builder setUserRating(@Nullable Rating userRating) {
|
||||||
this.userRating = userRating;
|
this.userRating = userRating;
|
||||||
|
|
@ -426,9 +418,6 @@ public final class MediaMetadata implements Bundleable {
|
||||||
if (mediaMetadata.description != null) {
|
if (mediaMetadata.description != null) {
|
||||||
setDescription(mediaMetadata.description);
|
setDescription(mediaMetadata.description);
|
||||||
}
|
}
|
||||||
if (mediaMetadata.mediaUri != null) {
|
|
||||||
setMediaUri(mediaMetadata.mediaUri);
|
|
||||||
}
|
|
||||||
if (mediaMetadata.userRating != null) {
|
if (mediaMetadata.userRating != null) {
|
||||||
setUserRating(mediaMetadata.userRating);
|
setUserRating(mediaMetadata.userRating);
|
||||||
}
|
}
|
||||||
|
|
@ -631,8 +620,6 @@ public final class MediaMetadata implements Bundleable {
|
||||||
@Nullable public final CharSequence subtitle;
|
@Nullable public final CharSequence subtitle;
|
||||||
/** Optional description. */
|
/** Optional description. */
|
||||||
@Nullable public final CharSequence description;
|
@Nullable public final CharSequence description;
|
||||||
/** Optional media {@link Uri}. */
|
|
||||||
@Nullable public final Uri mediaUri;
|
|
||||||
/** Optional user {@link Rating}. */
|
/** Optional user {@link Rating}. */
|
||||||
@Nullable public final Rating userRating;
|
@Nullable public final Rating userRating;
|
||||||
/** Optional overall {@link Rating}. */
|
/** Optional overall {@link Rating}. */
|
||||||
|
|
@ -717,7 +704,6 @@ public final class MediaMetadata implements Bundleable {
|
||||||
this.displayTitle = builder.displayTitle;
|
this.displayTitle = builder.displayTitle;
|
||||||
this.subtitle = builder.subtitle;
|
this.subtitle = builder.subtitle;
|
||||||
this.description = builder.description;
|
this.description = builder.description;
|
||||||
this.mediaUri = builder.mediaUri;
|
|
||||||
this.userRating = builder.userRating;
|
this.userRating = builder.userRating;
|
||||||
this.overallRating = builder.overallRating;
|
this.overallRating = builder.overallRating;
|
||||||
this.artworkData = builder.artworkData;
|
this.artworkData = builder.artworkData;
|
||||||
|
|
@ -766,7 +752,6 @@ public final class MediaMetadata implements Bundleable {
|
||||||
&& Util.areEqual(displayTitle, that.displayTitle)
|
&& Util.areEqual(displayTitle, that.displayTitle)
|
||||||
&& Util.areEqual(subtitle, that.subtitle)
|
&& Util.areEqual(subtitle, that.subtitle)
|
||||||
&& Util.areEqual(description, that.description)
|
&& Util.areEqual(description, that.description)
|
||||||
&& Util.areEqual(mediaUri, that.mediaUri)
|
|
||||||
&& Util.areEqual(userRating, that.userRating)
|
&& Util.areEqual(userRating, that.userRating)
|
||||||
&& Util.areEqual(overallRating, that.overallRating)
|
&& Util.areEqual(overallRating, that.overallRating)
|
||||||
&& Arrays.equals(artworkData, that.artworkData)
|
&& Arrays.equals(artworkData, that.artworkData)
|
||||||
|
|
@ -802,7 +787,6 @@ public final class MediaMetadata implements Bundleable {
|
||||||
displayTitle,
|
displayTitle,
|
||||||
subtitle,
|
subtitle,
|
||||||
description,
|
description,
|
||||||
mediaUri,
|
|
||||||
userRating,
|
userRating,
|
||||||
overallRating,
|
overallRating,
|
||||||
Arrays.hashCode(artworkData),
|
Arrays.hashCode(artworkData),
|
||||||
|
|
@ -912,7 +896,6 @@ public final class MediaMetadata implements Bundleable {
|
||||||
bundle.putCharSequence(keyForField(FIELD_DISPLAY_TITLE), displayTitle);
|
bundle.putCharSequence(keyForField(FIELD_DISPLAY_TITLE), displayTitle);
|
||||||
bundle.putCharSequence(keyForField(FIELD_SUBTITLE), subtitle);
|
bundle.putCharSequence(keyForField(FIELD_SUBTITLE), subtitle);
|
||||||
bundle.putCharSequence(keyForField(FIELD_DESCRIPTION), description);
|
bundle.putCharSequence(keyForField(FIELD_DESCRIPTION), description);
|
||||||
bundle.putParcelable(keyForField(FIELD_MEDIA_URI), mediaUri);
|
|
||||||
bundle.putByteArray(keyForField(FIELD_ARTWORK_DATA), artworkData);
|
bundle.putByteArray(keyForField(FIELD_ARTWORK_DATA), artworkData);
|
||||||
bundle.putParcelable(keyForField(FIELD_ARTWORK_URI), artworkUri);
|
bundle.putParcelable(keyForField(FIELD_ARTWORK_URI), artworkUri);
|
||||||
bundle.putCharSequence(keyForField(FIELD_WRITER), writer);
|
bundle.putCharSequence(keyForField(FIELD_WRITER), writer);
|
||||||
|
|
@ -986,7 +969,6 @@ public final class MediaMetadata implements Bundleable {
|
||||||
.setDisplayTitle(bundle.getCharSequence(keyForField(FIELD_DISPLAY_TITLE)))
|
.setDisplayTitle(bundle.getCharSequence(keyForField(FIELD_DISPLAY_TITLE)))
|
||||||
.setSubtitle(bundle.getCharSequence(keyForField(FIELD_SUBTITLE)))
|
.setSubtitle(bundle.getCharSequence(keyForField(FIELD_SUBTITLE)))
|
||||||
.setDescription(bundle.getCharSequence(keyForField(FIELD_DESCRIPTION)))
|
.setDescription(bundle.getCharSequence(keyForField(FIELD_DESCRIPTION)))
|
||||||
.setMediaUri(bundle.getParcelable(keyForField(FIELD_MEDIA_URI)))
|
|
||||||
.setArtworkData(
|
.setArtworkData(
|
||||||
bundle.getByteArray(keyForField(FIELD_ARTWORK_DATA)),
|
bundle.getByteArray(keyForField(FIELD_ARTWORK_DATA)),
|
||||||
bundle.containsKey(keyForField(FIELD_ARTWORK_DATA_TYPE))
|
bundle.containsKey(keyForField(FIELD_ARTWORK_DATA_TYPE))
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,6 @@ public class MediaMetadataTest {
|
||||||
assertThat(mediaMetadata.displayTitle).isNull();
|
assertThat(mediaMetadata.displayTitle).isNull();
|
||||||
assertThat(mediaMetadata.subtitle).isNull();
|
assertThat(mediaMetadata.subtitle).isNull();
|
||||||
assertThat(mediaMetadata.description).isNull();
|
assertThat(mediaMetadata.description).isNull();
|
||||||
assertThat(mediaMetadata.mediaUri).isNull();
|
|
||||||
assertThat(mediaMetadata.userRating).isNull();
|
assertThat(mediaMetadata.userRating).isNull();
|
||||||
assertThat(mediaMetadata.overallRating).isNull();
|
assertThat(mediaMetadata.overallRating).isNull();
|
||||||
assertThat(mediaMetadata.artworkData).isNull();
|
assertThat(mediaMetadata.artworkData).isNull();
|
||||||
|
|
@ -127,7 +126,6 @@ public class MediaMetadataTest {
|
||||||
.setDisplayTitle("display title")
|
.setDisplayTitle("display title")
|
||||||
.setSubtitle("subtitle")
|
.setSubtitle("subtitle")
|
||||||
.setDescription("description")
|
.setDescription("description")
|
||||||
.setMediaUri(Uri.parse("https://www.google.com"))
|
|
||||||
.setUserRating(new HeartRating(false))
|
.setUserRating(new HeartRating(false))
|
||||||
.setOverallRating(new PercentageRating(87.4f))
|
.setOverallRating(new PercentageRating(87.4f))
|
||||||
.setArtworkData(
|
.setArtworkData(
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue