Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer image that is specified in feed over embedded image

Browse Source
This commit is contained in:
ByteHamster 2019-10-27 22:52:41 +01:00
parent eb5514c764
commit 20e025bd2e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
View File

@ -375,10 +375,10 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, ImageR
@Override @Override
public String getImageLocation() { public String getImageLocation() {
if(media != null && media.hasEmbeddedPicture()) { if (imageUrl != null) {
return media.getImageLocation(); return imageUrl;
} else if (imageUrl != null) { } else if (media != null && media.hasEmbeddedPicture()) {
return imageUrl; return media.getLocalMediaUrl();
} else if (feed != null) { } else if (feed != null) {
return feed.getImageLocation(); return feed.getImageLocation();
} else { } else {

6
core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
View File

@ -566,10 +566,10 @@ public class FeedMedia extends FeedFile implements Playable {
@Override @Override
public String getImageLocation() { public String getImageLocation() {
if (hasEmbeddedPicture()) { if (item != null) {
return getLocalMediaUrl();
} else if(item != null) {
return item.getImageLocation(); return item.getImageLocation();
} else if (hasEmbeddedPicture()) {
return getLocalMediaUrl();
} else { } else {
return null; return null;
} }