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

Merge pull request #783 from TomHennen/fix_npe_on_shutdown 

Fixes NPE in PlaybackWidgetService
This commit is contained in:
Tom Hennen 2015-05-02 21:56:25 -04:00
parent b492fc9bff 686ee7ed86
commit 4e78205e62
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
View File

@ -52,19 +52,20 @@ public class PlayerWidgetService extends Service {
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
Log.d(TAG, "Service is about to be destroyed"); Log.d(TAG, "Service is about to be destroyed");
if (playbackService != null) {
Playable playable = playbackService.getPlayable(); Playable playable = playbackService.getPlayable();
if(playable != null && playable instanceof FeedMedia) { if (playable != null && playable instanceof FeedMedia) {
FeedMedia media = (FeedMedia) playable; FeedMedia media = (FeedMedia) playable;
if(media.hasAlmostEnded()) { if (media.hasAlmostEnded()) {
Log.d(TAG, "smart mark as read"); Log.d(TAG, "smart mark as read");
FeedItem item = media.getItem(); FeedItem item = media.getItem();
DBWriter.markItemRead(this, item, true, false); DBWriter.markItemRead(this, item, true, false);
DBWriter.removeQueueItem(this, item, false); DBWriter.removeQueueItem(this, item, false);
DBWriter.addItemToPlaybackHistory(this, media); DBWriter.addItemToPlaybackHistory(this, media);
if (UserPreferences.isAutoDelete()) { if (UserPreferences.isAutoDelete()) {
Log.d(TAG, "Delete " + media.toString()); Log.d(TAG, "Delete " + media.toString());
DBWriter.deleteFeedMediaOfItem(this, media.getId()); DBWriter.deleteFeedMediaOfItem(this, media.getId());
}
} }
} }
} }