diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-09-04 18:56:00 -0400 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-09-04 18:56:00 -0400 |
commit | 794cf98ffb50eca97261af3fe67142d8022732b7 (patch) | |
tree | 6941d5acb6a9d946e1fe978899656abd76943e4e /core/src/main/java/de | |
parent | c7d8a1bae890d6ea069d09cfa642dd76f060eec8 (diff) | |
parent | 2292b82252c2d098fdd95a1f11541418e830f57f (diff) | |
download | AntennaPod-794cf98ffb50eca97261af3fe67142d8022732b7.zip |
Merge pull request #1167 from TomHennen/fix_npe_gpodnetsyncservice
fix NPE when action has no timestamp
Diffstat (limited to 'core/src/main/java/de')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java | 4 |
1 files changed, 3 insertions, 1 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 7878d19a0..915f5ee1b 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 @@ -260,8 +260,10 @@ public class GpodnetSyncService extends Service { GpodnetEpisodeAction mostRecent = mostRecentPlayAction.get(key); if (mostRecent == null || mostRecent.getTimestamp() == null) { mostRecentPlayAction.put(key, action); - } else if (mostRecent.getTimestamp().before(action.getTimestamp())) { + } else if (action.getTimestamp() != null && mostRecent.getTimestamp().before(action.getTimestamp())) { mostRecentPlayAction.put(key, action); + } else { + Log.d(TAG, "No date information in action, skipping it"); } } break; |