summaryrefslogtreecommitdiff
path: root/core/src/main/java/de
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2017-06-05 10:55:20 +0200
committerMartin Fietz <Martin.Fietz@gmail.com>2017-06-05 11:26:42 +0200
commit19acd8d88c8496be587013c38e1d55652fdc65f7 (patch)
treee8e3cd88d64db47094864b1863d7dde448762726 /core/src/main/java/de
parent404a9c2fbfff75c0a15954469209308f57500f78 (diff)
downloadAntennaPod-19acd8d88c8496be587013c38e1d55652fdc65f7.zip
1183 Update feed image
Diffstat (limited to 'core/src/main/java/de')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
index d4af60a07..746dd43c4 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
@@ -266,6 +266,9 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
public void updateFromOther(Feed other) {
// don't update feed's download_url, we do that manually if redirected
// see AntennapodHttpClient
+ if (other.image != null) {
+ this.image = other.image;
+ }
if (other.feedTitle != null) {
feedTitle = other.feedTitle;
}
@@ -302,6 +305,9 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
if (super.compareWithOther(other)) {
return true;
}
+ if(other.image != null && !TextUtils.equals(image.download_url, other.image.download_url)) {
+ return true;
+ }
if (!TextUtils.equals(feedTitle, other.feedTitle)) {
return true;
}