diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-10-24 10:21:29 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-10-24 10:21:29 -0400 |
| commit | c9986edc5ed7a97c20cf259e79055f486bdca5d1 (patch) | |
| tree | 4bbe5a71c6e44a8ab5c034a6abd49b634fe25b89 /core/src/main/java/de | |
| parent | 6a94b07f7ec6914ca8d83d7a7bb68f046c8f9ec2 (diff) | |
| parent | 29a4e27493918f7fdf2867367cbe2f27ab1d7424 (diff) | |
| download | AntennaPod-c9986edc5ed7a97c20cf259e79055f486bdca5d1.zip | |
Merge pull request #1287 from TomHennen/fix1274
if we're skipping an epsiode and keeping it, don't mark it played.
Diffstat (limited to 'core/src/main/java/de')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java | 11 |
1 files changed, 8 insertions, 3 deletions
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 ab49bad08..5cef2fe79 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 @@ -566,7 +566,6 @@ public class PlaybackService extends Service { if (playable instanceof FeedMedia) { FeedMedia media = (FeedMedia) playable; FeedItem item = media.getItem(); - DBWriter.markItemPlayed(item, FeedItem.PLAYED, true); try { final List<FeedItem> queue = taskManager.getQueue(); @@ -579,9 +578,15 @@ public class PlaybackService extends Service { boolean shouldKeep = wasSkipped && UserPreferences.shouldSkipKeepEpisode(); - if (isInQueue && !shouldKeep) { - DBWriter.removeQueueItem(PlaybackService.this, item, true); + if (!shouldKeep) { + // only mark the item as played if we're not keeping it anyways + DBWriter.markItemPlayed(item, FeedItem.PLAYED, true); + + if (isInQueue) { + DBWriter.removeQueueItem(PlaybackService.this, item, true); + } } + DBWriter.addItemToPlaybackHistory(media); // auto-flattr if enabled |