diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java | 2 | ||||
-rw-r--r-- | core/src/test/java/de/danoeh/antennapod/core/feed/FeedItemTest.java | 13 |
2 files changed, 14 insertions, 1 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 8d123a432..ca387925f 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 @@ -185,7 +185,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, ImageR if (other.link != null) { link = other.link; } - if (other.pubDate != null && other.pubDate.equals(pubDate)) { + if (other.pubDate != null && !other.pubDate.equals(pubDate)) { pubDate = other.pubDate; } if (other.media != null) { diff --git a/core/src/test/java/de/danoeh/antennapod/core/feed/FeedItemTest.java b/core/src/test/java/de/danoeh/antennapod/core/feed/FeedItemTest.java index 857827219..6bd753561 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/feed/FeedItemTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/feed/FeedItemTest.java @@ -3,6 +3,9 @@ package de.danoeh.antennapod.core.feed; import org.junit.Before; import org.junit.Test; +import java.text.SimpleDateFormat; +import java.util.Date; + import static de.danoeh.antennapod.core.feed.FeedItemMother.anyFeedItemWithImage; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -40,6 +43,16 @@ public class FeedItemTest { assertFeedItemImageWasUpdated(); } + @Test + public void testUpdateFromOther_dateChanged() throws Exception { + Date originalDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("1952-03-11 00:00:00"); + Date changedDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("1952-03-11 00:42:42"); + original.setPubDate(originalDate); + changedFeedItem.setPubDate(changedDate); + original.updateFromOther(changedFeedItem); + assertEquals(changedDate.getTime(), original.getPubDate().getTime()); + } + /** * Test that a played item loses that state after being marked as new. */ |