diff options
author | Martin Fietz <Martin.Fietz@gmail.com> | 2018-03-05 20:28:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-05 20:28:44 +0100 |
commit | f3299e7de2b9b7733f0ed572e20dc39679971b5a (patch) | |
tree | d118c02252617703c870c118bd00ebe475fa99ce | |
parent | c13acc624dcf680c00f629bccf580da3a5ae133d (diff) | |
parent | f514a439e22db0563f9cf1be712d2ec8873dbc22 (diff) | |
download | AntennaPod-f3299e7de2b9b7733f0ed572e20dc39679971b5a.zip |
Merge pull request #2587 from jannic/pr
Fix possible NPE accessing image.download_url
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java | 6 |
1 files changed, 4 insertions, 2 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 746dd43c4..78df74ee7 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 @@ -305,8 +305,10 @@ 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 (other.image != null) { + if (image == null || !TextUtils.equals(image.download_url, other.image.download_url)) { + return true; + } } if (!TextUtils.equals(feedTitle, other.feedTitle)) { return true; |