summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorByteHamster <ByteHamster@users.noreply.github.com>2023-04-06 20:01:39 +0200
committerGitHub <noreply@github.com>2023-04-06 20:01:39 +0200
commit7ed78887c4411762f1fff67d3ca2330deaec2cac (patch)
tree59c9fbf8a64b7f656f55ba6e5ba25e82c80c0aea /core
parent596bdaed3fe4d5aa0c90ba5a8f21f0bf4e719ef2 (diff)
downloadAntennaPod-7ed78887c4411762f1fff67d3ca2330deaec2cac.zip
Ignore 'new' action during sync (#6415)
We never want to overwrite the local playback state.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/sync/EpisodeActionFilter.java2
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java4
2 files changed, 0 insertions, 6 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/sync/EpisodeActionFilter.java b/core/src/main/java/de/danoeh/antennapod/core/sync/EpisodeActionFilter.java
index 184f24793..8250ab87e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/sync/EpisodeActionFilter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/sync/EpisodeActionFilter.java
@@ -25,8 +25,6 @@ public class EpisodeActionFilter {
Pair<String, String> key = new Pair<>(remoteAction.getPodcast(), remoteAction.getEpisode());
switch (remoteAction.getAction()) {
case NEW:
- remoteActionsThatOverrideLocalActions.put(key, remoteAction);
- break;
case DOWNLOAD:
break;
case PLAY:
diff --git a/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java b/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java
index 2fd492cbd..7fe0c5e46 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java
@@ -274,10 +274,6 @@ public class SyncService extends Worker {
Log.i(TAG, "Feed item has no media: " + action);
continue;
}
- if (action.getAction() == EpisodeAction.NEW) {
- DBWriter.markItemPlayed(feedItem, FeedItem.UNPLAYED, true);
- continue;
- }
feedItem.getMedia().setPosition(action.getPosition() * 1000);
if (FeedItemUtil.hasAlmostEnded(feedItem.getMedia())) {
Log.d(TAG, "Marking as played: " + action);