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

Merge pull request #1657 from mfietz/issue/1656-npe-feedtitle

Browse Source 
Prevent FeedMedia.getFeedTitle() NPE
This commit is contained in:
Martin Fietz 2016-02-12 10:58:19 +01:00
commit 863ea5d162
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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