Merge pull request #1287 from TomHennen/fix1274

if we're skipping an epsiode and keeping it, don't mark it played.
This commit is contained in:
Tom Hennen 2015-10-24 10:21:29 -04:00
commit c9986edc5e

View File

@ -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) {
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