diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2016-02-13 11:52:44 -0500 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2016-02-13 11:52:44 -0500 |
commit | 5cdd873fada5ba1192f9c6fbc2dc036e1de30622 (patch) | |
tree | bdccf6fe765d241a1f870c43ea74701ebd6efa86 /core/src/main | |
parent | 294cb388098a5d5e42f96ecc9e43b4c70fe0eac8 (diff) | |
parent | 438a9c2a4b3bfec2197e896eb91748a1c09e9f08 (diff) | |
download | AntennaPod-5cdd873fada5ba1192f9c6fbc2dc036e1de30622.zip |
Merge pull request #1667 from mfietz/issue/1658-sync-duplicates
Prevent gpodder sync duplicates
Diffstat (limited to 'core/src/main')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java index a24e3a485..48f234917 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java @@ -735,13 +735,19 @@ public class GpodnetService { List<String> added = new LinkedList<String>(); JSONArray jsonAdded = object.getJSONArray("add"); for (int i = 0; i < jsonAdded.length(); i++) { - added.add(jsonAdded.getString(i)); + String addedUrl = jsonAdded.getString(i); + // gpodder escapes colons unnecessarily + addedUrl = addedUrl.replace("%3A", ":"); + added.add(addedUrl); } List<String> removed = new LinkedList<String>(); JSONArray jsonRemoved = object.getJSONArray("remove"); for (int i = 0; i < jsonRemoved.length(); i++) { - removed.add(jsonRemoved.getString(i)); + String removedUrl = jsonRemoved.getString(i); + // gpodder escapes colons unnecessarily + removedUrl = removedUrl.replace("%3A", ":"); + removed.add(removedUrl); } long timestamp = object.getLong("timestamp"); |