diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2016-11-12 09:25:10 +0100 |
|---|---|---|
| committer | Martin Fietz <Martin.Fietz@gmail.com> | 2016-11-12 09:25:10 +0100 |
| commit | 4a6b630e56fc486308b6fb53784264e36988fd78 (patch) | |
| tree | 66b06245c963175d1921016554c552b1eecb6aa1 /core/src/main/java | |
| parent | aab9f510772e4ea8b845dec019bd19b607fabe3f (diff) | |
| download | AntennaPod-4a6b630e56fc486308b6fb53784264e36988fd78.zip | |
Prevent NPE1.6.2.2
Diffstat (limited to 'core/src/main/java')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java | 2 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java index 2481645e0..ee7a738d0 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java @@ -1,6 +1,7 @@ package de.danoeh.antennapod.core.feed; import android.database.Cursor; +import android.support.annotation.Nullable; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -269,6 +270,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr } } + @Nullable public FeedMedia getMedia() { return media; } diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index ee6c46130..b556bba7a 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -301,7 +301,10 @@ public class PlaybackService extends MediaBrowserServiceCompat { List<MediaSessionCompat.QueueItem> queueItems = new ArrayList<>(); try { for (FeedItem feedItem : taskManager.getQueue()) { - queueItems.add(new MediaSessionCompat.QueueItem(feedItem.getMedia().getMediaItem().getDescription(), feedItem.getId())); + if(feedItem.getMedia() != null) { + MediaDescriptionCompat mediaDescription = feedItem.getMedia().getMediaItem().getDescription(); + queueItems.add(new MediaSessionCompat.QueueItem(mediaDescription, feedItem.getId())); + } } mediaSession.setQueue(queueItems); } catch (InterruptedException e) { |