From 4cc31d4be97b35608771ddf7eabee98c9dc3252c Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Thu, 24 Mar 2016 11:52:51 +0100 Subject: Reset episode to new if episode file is added later --- core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java | 2 ++ core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'core/src/main') 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 b2192c66f..4921c0576 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 @@ -195,6 +195,8 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr if (other.media != null) { if (media == null) { setMedia(other.media); + // reset to new if feed item did link to a file before + setNew(); } else if (media.compareWithOther(other.media)) { media.updateFromOther(other.media); } diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java index 8a04e65ec..991499316 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java @@ -8,7 +8,6 @@ import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.Nullable; -import android.text.TextUtils; import java.util.Date; import java.util.List; @@ -168,10 +167,6 @@ public class FeedMedia extends FeedFile implements Playable { } public void updateFromOther(FeedMedia other) { - // reset to new if feed item did link to a file before - if(TextUtils.isEmpty(download_url) && !TextUtils.isEmpty(other.download_url)) { - item.setNew(); - } super.updateFromOther(other); if (other.size > 0) { size = other.size; -- cgit v1.2.3