diff options
Diffstat (limited to 'core')
3 files changed, 40 insertions, 25 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java index c63b61f55..5a4d869e7 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java @@ -135,8 +135,8 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr if (other.media != null) { if (media == null) { setMedia(other.media); - } else if (media.compareWithOther(other)) { - media.updateFromOther(other); + } else if (media.compareWithOther(other.media)) { + media.updateFromOther(other.media); } } if (other.paymentLink != null) { 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 791ccd5ec..a353c984a 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 @@ -172,9 +172,10 @@ public class GpodnetService { jsonTagList.length()); for (int i = 0; i < jsonTagList.length(); i++) { JSONObject jObj = jsonTagList.getJSONObject(i); - String name = jObj.getString("tag"); + String title = jObj.getString("title"); + String tag = jObj.getString("tag"); int usage = jObj.getInt("usage"); - tagList.add(new GpodnetTag(name, usage)); + tagList.add(new GpodnetTag(title, tag, usage)); } return tagList; } catch (JSONException e) { @@ -194,7 +195,7 @@ public class GpodnetService { try { URL url = new URI(BASE_SCHEME, BASE_HOST, String.format( - "/api/2/tag/%s/%d.json", tag.getName(), count), null).toURL(); + "/api/2/tag/%s/%d.json", tag.getTag(), count), null).toURL(); Request.Builder request = new Request.Builder().url(url); String response = executeRequest(request); diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetTag.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetTag.java index 7178f4be5..cd865731b 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetTag.java +++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetTag.java @@ -1,46 +1,60 @@ package de.danoeh.antennapod.core.gpoddernet.model; -import org.apache.commons.lang3.Validate; +import android.os.Parcel; +import android.os.Parcelable; -import java.util.Comparator; +import org.apache.commons.lang3.Validate; -public class GpodnetTag { +public class GpodnetTag implements Parcelable { - private String name; - private int usage; + private final String title; + private final String tag; + private final int usage; - public GpodnetTag(String name, int usage) { - Validate.notNull(name); + public GpodnetTag(String title, String tag, int usage) { + Validate.notNull(title); + Validate.notNull(tag); - this.name = name; + this.title = title; + this.tag = tag; this.usage = usage; } - public GpodnetTag(String name) { - super(); - this.name = name; + public static GpodnetTag createFromParcel(Parcel in) { + final String title = in.readString(); + final String tag = in.readString(); + final int usage = in.readInt(); + return new GpodnetTag(title, tag, usage); } @Override public String toString() { - return "GpodnetTag [name=" + name + ", usage=" + usage + "]"; + return "GpodnetTag [title="+title+", tag=" + tag + ", usage=" + usage + "]"; } - public String getName() { - return name; + public String getTitle() { + return title; + } + + public String getTag() { + return tag; } public int getUsage() { return usage; } - public static class UsageComparator implements Comparator<GpodnetTag> { - - @Override - public int compare(GpodnetTag o1, GpodnetTag o2) { - return o1.usage - o2.usage; - } + @Override + public int describeContents() { + return 0; + } + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(title); + dest.writeString(tag); + dest.writeInt(usage); } + } |