diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2023-07-15 22:03:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-15 22:03:50 +0200 |
commit | f1f36742309a2aebd0aab0d5c7d3016dfe23ec0c (patch) | |
tree | d9d2fa7656f564ca6c49e6e94b8a9090f4290e46 /playback/cast/src/play | |
parent | 8d1eb62f0bf3c5014a632acbbf98f06d07cf666e (diff) | |
download | AntennaPod-f1f36742309a2aebd0aab0d5c7d3016dfe23ec0c.zip |
Fix Chromecast crash if FeedItem does not have a feed (#6541)
Diffstat (limited to 'playback/cast/src/play')
-rw-r--r-- | playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/MediaInfoCreator.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/MediaInfoCreator.java b/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/MediaInfoCreator.java index dd408d4a7..f579d4110 100644 --- a/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/MediaInfoCreator.java +++ b/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/MediaInfoCreator.java @@ -2,6 +2,7 @@ package de.danoeh.antennapod.playback.cast; import android.net.Uri; import android.text.TextUtils; +import androidx.annotation.Nullable; import com.google.android.gms.cast.MediaInfo; import com.google.android.gms.cast.MediaMetadata; import com.google.android.gms.common.images.WebImage; @@ -74,7 +75,6 @@ public class MediaInfoCreator { MediaMetadata metadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_GENERIC); if (media.getItem() == null) { throw new IllegalStateException("item is null"); - //media.setItem(DBReader.getFeedItem(media.getItemId())); } FeedItem feedItem = media.getItem(); if (feedItem != null) { @@ -84,15 +84,15 @@ public class MediaInfoCreator { metadata.putString(MediaMetadata.KEY_SUBTITLE, subtitle); } + final @Nullable Feed feed = feedItem.getFeed(); // Manual because cast does not support embedded images - String url = feedItem.getImageUrl() == null ? feedItem.getFeed().getImageUrl() : feedItem.getImageUrl(); + String url = (feedItem.getImageUrl() == null && feed != null) ? feed.getImageUrl() : feedItem.getImageUrl(); if (!TextUtils.isEmpty(url)) { metadata.addImage(new WebImage(Uri.parse(url))); } Calendar calendar = Calendar.getInstance(); calendar.setTime(media.getItem().getPubDate()); metadata.putDate(MediaMetadata.KEY_RELEASE_DATE, calendar); - Feed feed = feedItem.getFeed(); if (feed != null) { if (!TextUtils.isEmpty(feed.getAuthor())) { metadata.putString(MediaMetadata.KEY_ARTIST, feed.getAuthor()); |