diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-03-21 10:14:09 -0400 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-03-21 10:14:09 -0400 |
commit | 94d86d81c03ebd8e70d0f5e4349e93754ec3c68d (patch) | |
tree | fd796fdf3b2bd9aafa294c136b91035719fa3658 /app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java | |
parent | 21dabab909326e7ad99c41ce5f8da468ebf480c3 (diff) | |
parent | d961b1796e5868ef5f7000417cef6255e411b94d (diff) | |
download | AntennaPod-94d86d81c03ebd8e70d0f5e4349e93754ec3c68d.zip |
Merge pull request #686 from AntennaPod/revert-681-feature/downloader-if-modified-since
Revert "Downloader use If-Modified-Since HTTP header"
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java index 3b03ed2db..9f028000e 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java @@ -13,21 +13,9 @@ import android.widget.ArrayAdapter; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.RelativeLayout; - -import org.apache.commons.lang3.StringUtils; -import org.xml.sax.SAXException; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import javax.xml.parsers.ParserConfigurationException; - import de.danoeh.antennapod.BuildConfig; import de.danoeh.antennapod.R; +import de.danoeh.antennapod.dialog.AuthenticationDialog; import de.danoeh.antennapod.core.feed.Feed; import de.danoeh.antennapod.core.feed.FeedPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences; @@ -43,7 +31,16 @@ import de.danoeh.antennapod.core.util.FileNameGenerator; import de.danoeh.antennapod.core.util.StorageUtils; import de.danoeh.antennapod.core.util.URLChecker; import de.danoeh.antennapod.core.util.syndication.FeedDiscoverer; -import de.danoeh.antennapod.dialog.AuthenticationDialog; +import org.apache.commons.lang3.StringUtils; +import org.xml.sax.SAXException; + +import javax.xml.parsers.ParserConfigurationException; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * Downloads a feed from a feed URL and parses it. Subclasses can display the @@ -184,7 +181,7 @@ public abstract class OnlineFeedViewActivity extends ActionBarActivity { if (BuildConfig.DEBUG) Log.d(TAG, "Starting feed download"); url = URLChecker.prepareURL(url); - feed = new Feed(url, new Date(0)); + feed = new Feed(url, new Date()); if (username != null && password != null) { feed.setPreferences(new FeedPreferences(0, false, username, password)); } |