From e0227f9b1686f9ab18c53a060f46e66af83e247b Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Sat, 15 Apr 2023 20:11:05 +0100
Subject: Handle a null timestamp in local/first actions (#6379)

---
 .../main/java/de/danoeh/antennapod/core/sync/EpisodeActionFilter.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/src/main/java')

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()));
     }
 
 }
-- 
cgit v1.2.3