From 29a4e27493918f7fdf2867367cbe2f27ab1d7424 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Fri, 23 Oct 2015 17:46:38 -0400 Subject: if we're skipping an epsiode and keeping it, don't mark it played. fixes AntennaPod/AntennaPod#1274 --- .../antennapod/core/service/playback/PlaybackService.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'core/src/main/java') 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 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 -- cgit v1.2.3