diff options
author | Martin Fietz <Martin.Fietz@gmail.com> | 2016-02-12 10:58:19 +0100 |
---|---|---|
committer | Martin Fietz <Martin.Fietz@gmail.com> | 2016-02-12 10:58:19 +0100 |
commit | 863ea5d1622c980054313a0c36897be7f9ea1810 (patch) | |
tree | d062137e8b3392516ae69917fbfd806780359f91 /core | |
parent | 099e7497857a22888511b0d6392e23e5b19b6287 (diff) | |
parent | b7ff0d1565eed94a8d7612ea7bdd7f5bb77457ec (diff) | |
download | AntennaPod-863ea5d1622c980054313a0c36897be7f9ea1810.zip |
Merge pull request #1657 from mfietz/issue/1656-npe-feedtitle
Prevent FeedMedia.getFeedTitle() NPE
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java | 20 |
1 files changed, 11 insertions, 9 deletions
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 56b996d1c..f1ecaf04f 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 @@ -400,10 +400,10 @@ public class FeedMedia extends FeedFile implements Playable { if (item == null) { return null; } - if (getItem().getTitle() != null) { - return getItem().getTitle(); + if (item.getTitle() != null) { + return item.getTitle(); } else { - return getItem().getIdentifyingValue(); + return item.getIdentifyingValue(); } } @@ -412,7 +412,7 @@ public class FeedMedia extends FeedFile implements Playable { if (item == null) { return null; } - return getItem().getChapters(); + return item.getChapters(); } @Override @@ -420,15 +420,15 @@ public class FeedMedia extends FeedFile implements Playable { if (item == null) { return null; } - return getItem().getLink(); + return item.getLink(); } @Override public String getFeedTitle() { - if (item == null) { + if (item == null || item.getFeed() == null) { return null; } - return getItem().getFeed().getTitle(); + return item.getFeed().getTitle(); } @Override @@ -451,7 +451,7 @@ public class FeedMedia extends FeedFile implements Playable { if (item == null) { return null; } - return getItem().getPaymentLink(); + return item.getPaymentLink(); } @Override @@ -489,7 +489,9 @@ public class FeedMedia extends FeedFile implements Playable { @Override public void setChapters(List<Chapter> chapters) { - getItem().setChapters(chapters); + if(item != null) { + item.setChapters(chapters); + } } @Override |