summaryrefslogtreecommitdiff
path: root/core/src/main
diff options
context:
space:
mode:
authorRob Pilling <robpilling@gmail.com>2023-04-15 20:11:05 +0100
committerGitHub <noreply@github.com>2023-04-15 21:11:05 +0200
commite0227f9b1686f9ab18c53a060f46e66af83e247b (patch)
tree0f01a6466b89d36cc8704b3a94ac490a30206e0c /core/src/main
parent0bdf9d9e28572bba38fd36ad518e817dbdd04fe5 (diff)
downloadAntennaPod-e0227f9b1686f9ab18c53a060f46e66af83e247b.zip
Handle a null timestamp in local/first actions (#6379)
Diffstat (limited to 'core/src/main')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/sync/EpisodeActionFilter.java3
1 files changed, 2 insertions, 1 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 8250ab87e..f616b9c4e 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
@@ -70,7 +70,8 @@ public class EpisodeActionFilter {
EpisodeAction secondAction) {
return secondAction != null
&& secondAction.getTimestamp() != null
- && secondAction.getTimestamp().after(firstAction.getTimestamp());
+ && (firstAction.getTimestamp() == null
+ || secondAction.getTimestamp().after(firstAction.getTimestamp()));
}
}