diff options
Diffstat (limited to 'core/src/main/java/de')
4 files changed, 14 insertions, 5 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java index 96665bd51..61608992b 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java @@ -65,11 +65,12 @@ public class HttpDownloader extends Downloader { final URI uri = URIUtil.getURIFromRequestUrl(request.getSource()); Request.Builder httpReq = new Request.Builder().url(uri.toURL()); httpReq.tag(request); + httpReq.cacheControl(new CacheControl.Builder().noStore().build()); + if (request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) { // set header explicitly so that okhttp doesn't do transparent gzip Log.d(TAG, "addHeader(\"Accept-Encoding\", \"identity\")"); httpReq.addHeader("Accept-Encoding", "identity"); - httpReq.cacheControl(new CacheControl.Builder().noStore().build()); } if (!TextUtils.isEmpty(request.getLastModified())) { diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java index 6f9e6b056..f10dde65f 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java @@ -274,7 +274,7 @@ public class DownloadRequester implements DownloadStateProvider { } File dest; - if (feedmedia.getFile_url() != null) { + if (feedmedia.getFile_url() != null && new File(feedmedia.getFile_url()).exists()) { dest = new File(feedmedia.getFile_url()); } else { dest = new File(getMediafilePath(feedmedia), getMediafilename(feedmedia)); diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java index b75887154..737f902b7 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java @@ -4,7 +4,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import android.util.Log; +import java.net.URLConnection; import java.util.zip.CheckedOutputStream; + +import de.danoeh.antennapod.core.ClientConfig; import org.apache.commons.io.IOUtils; import java.io.BufferedInputStream; @@ -80,7 +83,9 @@ public class ChapterUtils { CountingInputStream in = null; try { URL url = new URL(p.getStreamUrl()); - in = new CountingInputStream(url.openStream()); + URLConnection urlConnection = url.openConnection(); + urlConnection.setRequestProperty("User-Agent", ClientConfig.USER_AGENT); + in = new CountingInputStream(urlConnection.getInputStream()); List<Chapter> chapters = readChaptersFrom(in); if (!chapters.isEmpty()) { p.setChapters(chapters); @@ -149,7 +154,9 @@ public class ChapterUtils { InputStream input = null; try { URL url = new URL(media.getStreamUrl()); - input = url.openStream(); + URLConnection urlConnection = url.openConnection(); + urlConnection.setRequestProperty("User-Agent", ClientConfig.USER_AGENT); + input = urlConnection.getInputStream(); if (input != null) { readOggChaptersFromInputStream(media, input); } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java index 4b3ffa389..aec53da4c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java @@ -6,6 +6,7 @@ import android.preference.PreferenceManager; import android.util.Log; import android.view.SurfaceHolder; +import de.danoeh.antennapod.core.ClientConfig; import org.antennapod.audio.MediaPlayer; import de.danoeh.antennapod.core.preferences.UserPreferences; @@ -17,7 +18,7 @@ public class AudioPlayer extends MediaPlayer implements IPlayer { private static final String TAG = "AudioPlayer"; public AudioPlayer(Context context) { - super(context); + super(context, true, ClientConfig.USER_AGENT); PreferenceManager.getDefaultSharedPreferences(context) .registerOnSharedPreferenceChangeListener((sharedPreferences, key) -> { if (key.equals(UserPreferences.PREF_MEDIA_PLAYER)) { |