diff options
| author | Tom Hennen <tom.hennen@gmail.com> | 2015-05-28 17:43:18 -0400 |
|---|---|---|
| committer | Tom Hennen <tom.hennen@gmail.com> | 2015-05-28 17:43:18 -0400 |
| commit | 3e9e730a2874b43a1f89c1e474a5b90b8500920e (patch) | |
| tree | 8200b4e62506b946caefa9f64ffa07b6ca3ed7da /core/src | |
| parent | 20bf3e883bca589409b9b2717886ced619450fd7 (diff) | |
| parent | 79ab68d56359dd8a02fd00441b8d2826f9c52c62 (diff) | |
| download | AntennaPod-3e9e730a2874b43a1f89c1e474a5b90b8500920e.zip | |
Merge branch 'develop' into update_strings_1.2
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java | 1 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java | 5 |
2 files changed, 3 insertions, 3 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 11348953e..1168c60e4 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 @@ -403,7 +403,6 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr return this.hasMedia() && false == this.getMedia().isPlaying() && false == this.getMedia().isDownloaded() && - false == this.isRead() && this.getAutoDownload(); } diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java index e570ee709..defce5930 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java @@ -308,10 +308,11 @@ public final class DBTasks { private static void refreshFeed(Context context, Feed feed, boolean loadAllPages) throws DownloadRequestException { Feed f; + Date lastUpdate = feed.hasLastUpdateFailed() ? new Date(0) : feed.getLastUpdate(); if (feed.getPreferences() == null) { - f = new Feed(feed.getDownload_url(), feed.getLastUpdate(), feed.getTitle()); + f = new Feed(feed.getDownload_url(), lastUpdate, feed.getTitle()); } else { - f = new Feed(feed.getDownload_url(), feed.getLastUpdate(), feed.getTitle(), + f = new Feed(feed.getDownload_url(), lastUpdate, feed.getTitle(), feed.getPreferences().getUsername(), feed.getPreferences().getPassword()); } f.setId(feed.getId()); |