Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

not every action has a timestamp. fixes AntennaPod/AntennaPod#1102

This commit is contained in:
Tom Hennen 2015-08-16 19:15:45 -04:00
parent 2f55256619
commit bf93cf3259
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
View File

@ -230,7 +230,7 @@ public class GpodnetSyncService extends Service {
for(GpodnetEpisodeAction action : localActions) { for(GpodnetEpisodeAction action : localActions) {
Pair key = new Pair(action.getPodcast(), action.getEpisode()); Pair key = new Pair(action.getPodcast(), action.getEpisode());
GpodnetEpisodeAction mostRecent = localMostRecentPlayAction.get(key); GpodnetEpisodeAction mostRecent = localMostRecentPlayAction.get(key);
if (mostRecent == null) { if (mostRecent == null || mostRecent.getTimestamp() == null) {
localMostRecentPlayAction.put(key, action); localMostRecentPlayAction.put(key, action);
} else if (mostRecent.getTimestamp().before(action.getTimestamp())) { } else if (mostRecent.getTimestamp().before(action.getTimestamp())) {
localMostRecentPlayAction.put(key, action); localMostRecentPlayAction.put(key, action);
@ -255,9 +255,10 @@ public class GpodnetSyncService extends Service {
Pair key = new Pair(action.getPodcast(), action.getEpisode()); Pair key = new Pair(action.getPodcast(), action.getEpisode());
GpodnetEpisodeAction localMostRecent = localMostRecentPlayAction.get(key); GpodnetEpisodeAction localMostRecent = localMostRecentPlayAction.get(key);
if(localMostRecent == null || if(localMostRecent == null ||
localMostRecent.getTimestamp() == null ||
localMostRecent.getTimestamp().before(action.getTimestamp())) { localMostRecent.getTimestamp().before(action.getTimestamp())) {
GpodnetEpisodeAction mostRecent = mostRecentPlayAction.get(key); GpodnetEpisodeAction mostRecent = mostRecentPlayAction.get(key);
if (mostRecent == null) { if (mostRecent == null || mostRecent.getTimestamp() == null) {
mostRecentPlayAction.put(key, action); mostRecentPlayAction.put(key, action);
} else if (mostRecent.getTimestamp().before(action.getTimestamp())) { } else if (mostRecent.getTimestamp().before(action.getTimestamp())) {
mostRecentPlayAction.put(key, action); mostRecentPlayAction.put(key, action);