diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2019-10-28 13:30:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-28 13:30:35 +0100 |
commit | 3b51af00e33df40ac9e03a53d72111f466f20f5e (patch) | |
tree | e1153ba92c655aeba5d585795dabac2aea68c591 /core | |
parent | eb5514c7648ce0a0a1e7e0462534b5175c83addf (diff) | |
parent | 20e025bd2e72ede506cb326ffdb5a13dd2e4fcf9 (diff) | |
download | AntennaPod-3b51af00e33df40ac9e03a53d72111f466f20f5e.zip |
Merge pull request #3567 from ByteHamster/prefer-image-from-feed
Prefer image that is specified in feed over embedded image
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java | 8 | ||||
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java index ecd34acff..8d123a432 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java @@ -375,10 +375,10 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, ImageR @Override public String getImageLocation() { - if(media != null && media.hasEmbeddedPicture()) { - return media.getImageLocation(); - } else if (imageUrl != null) { - return imageUrl; + if (imageUrl != null) { + return imageUrl; + } else if (media != null && media.hasEmbeddedPicture()) { + return media.getLocalMediaUrl(); } else if (feed != null) { return feed.getImageLocation(); } else { diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java index b1c2ff15a..572f32e66 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java @@ -566,10 +566,10 @@ public class FeedMedia extends FeedFile implements Playable { @Override public String getImageLocation() { - if (hasEmbeddedPicture()) { - return getLocalMediaUrl(); - } else if(item != null) { + if (item != null) { return item.getImageLocation(); + } else if (hasEmbeddedPicture()) { + return getLocalMediaUrl(); } else { return null; } |