diff options
| author | Tom Hennen <tom.hennen@gmail.com> | 2015-08-16 19:15:45 -0400 |
|---|---|---|
| committer | Tom Hennen <tom.hennen@gmail.com> | 2015-08-16 19:15:45 -0400 |
| commit | bf93cf3259d1464d9c9d99b32b362676845c7700 (patch) | |
| tree | 024be6b7f4769e9d3ad1e4dbdf8a6d9ae9280c8c | |
| parent | 2f552566192739bdeb0944ff28036745e259a650 (diff) | |
| download | AntennaPod-bf93cf3259d1464d9c9d99b32b362676845c7700.zip | |
not every action has a timestamp. fixes AntennaPod/AntennaPod#1102
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java index b80b4303f..7878d19a0 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java @@ -230,7 +230,7 @@ public class GpodnetSyncService extends Service { for(GpodnetEpisodeAction action : localActions) { Pair key = new Pair(action.getPodcast(), action.getEpisode()); GpodnetEpisodeAction mostRecent = localMostRecentPlayAction.get(key); - if (mostRecent == null) { + if (mostRecent == null || mostRecent.getTimestamp() == null) { localMostRecentPlayAction.put(key, action); } else if (mostRecent.getTimestamp().before(action.getTimestamp())) { localMostRecentPlayAction.put(key, action); @@ -255,9 +255,10 @@ public class GpodnetSyncService extends Service { Pair key = new Pair(action.getPodcast(), action.getEpisode()); GpodnetEpisodeAction localMostRecent = localMostRecentPlayAction.get(key); if(localMostRecent == null || + localMostRecent.getTimestamp() == null || localMostRecent.getTimestamp().before(action.getTimestamp())) { GpodnetEpisodeAction mostRecent = mostRecentPlayAction.get(key); - if (mostRecent == null) { + if (mostRecent == null || mostRecent.getTimestamp() == null) { mostRecentPlayAction.put(key, action); } else if (mostRecent.getTimestamp().before(action.getTimestamp())) { mostRecentPlayAction.put(key, action); |