Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed NPE

This commit is contained in:
ByteHamster 2019-05-08 15:37:44 +02:00
parent c6e81391b2
commit e464569712
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
View File

@ -592,7 +592,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
private FeedItem loadInBackground() { private FeedItem loadInBackground() {
FeedItem feedItem = DBReader.getFeedItem(feedItems[feedItemPos]); FeedItem feedItem = DBReader.getFeedItem(feedItems[feedItemPos]);
if (feedItem != null) { if (feedItem != null) {
Timeline t = new Timeline(getActivity(), feedItem); Timeline t = new Timeline(getContext(), feedItem);
webviewData = t.processShownotes(false); webviewData = t.processShownotes(false);
} }
return feedItem; return feedItem;

5
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -421,7 +421,10 @@ public class PlaybackService extends MediaBrowserServiceCompat {
// Child List // Child List
try { try {
for (FeedItem feedItem : taskManager.getQueue()) { for (FeedItem feedItem : taskManager.getQueue()) {
mediaItems.add(feedItem.getMedia().getMediaItem()); FeedMedia media = feedItem.getMedia();
if (media != null) {
mediaItems.add(media.getMediaItem());
}
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();