diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-05-02 21:56:25 -0400 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-05-02 21:56:25 -0400 |
commit | 4e78205e624b6f3b19272c2a04f02d14f44875fd (patch) | |
tree | 084a110b9ba04ab30d141b8ed3768ec2aefcf175 /app/src/main/java/de/danoeh | |
parent | b492fc9bff85e7c957182483632bf202f675e2cc (diff) | |
parent | 686ee7ed86be3943bef1f117d194e742354ef08c (diff) | |
download | AntennaPod-4e78205e624b6f3b19272c2a04f02d14f44875fd.zip |
Merge pull request #783 from TomHennen/fix_npe_on_shutdown
Fixes NPE in PlaybackWidgetService
Diffstat (limited to 'app/src/main/java/de/danoeh')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java index 1d9e8e412..0d00823d3 100644 --- a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java +++ b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java @@ -52,19 +52,20 @@ public class PlayerWidgetService extends Service { public void onDestroy() { super.onDestroy(); Log.d(TAG, "Service is about to be destroyed"); - - Playable playable = playbackService.getPlayable(); - if(playable != null && playable instanceof FeedMedia) { - FeedMedia media = (FeedMedia) playable; - if(media.hasAlmostEnded()) { - Log.d(TAG, "smart mark as read"); - FeedItem item = media.getItem(); - DBWriter.markItemRead(this, item, true, false); - DBWriter.removeQueueItem(this, item, false); - DBWriter.addItemToPlaybackHistory(this, media); - if (UserPreferences.isAutoDelete()) { - Log.d(TAG, "Delete " + media.toString()); - DBWriter.deleteFeedMediaOfItem(this, media.getId()); + if (playbackService != null) { + Playable playable = playbackService.getPlayable(); + if (playable != null && playable instanceof FeedMedia) { + FeedMedia media = (FeedMedia) playable; + if (media.hasAlmostEnded()) { + Log.d(TAG, "smart mark as read"); + FeedItem item = media.getItem(); + DBWriter.markItemRead(this, item, true, false); + DBWriter.removeQueueItem(this, item, false); + DBWriter.addItemToPlaybackHistory(this, media); + if (UserPreferences.isAutoDelete()) { + Log.d(TAG, "Delete " + media.toString()); + DBWriter.deleteFeedMediaOfItem(this, media.getId()); + } } } } |