Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5827 from ByteHamster/redirect-https 

Upgrade feed url to https if possible
This commit is contained in:
ByteHamster 2022-04-02 12:32:38 +02:00 committed by GitHub
parent 00e98daa8b 0e43c3e508
commit 0c26eb6c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
View File

@ -73,6 +73,10 @@ public class HttpDownloader extends Downloader {
httpReq.cacheControl(new CacheControl.Builder().noCache().build()); // noStore breaks CDNs httpReq.cacheControl(new CacheControl.Builder().noCache().build()); // noStore breaks CDNs
} }
if (uri.getScheme().equals("http")) {
httpReq.addHeader("Upgrade-Insecure-Requests", "1");
}
if (!TextUtils.isEmpty(request.getLastModified())) { if (!TextUtils.isEmpty(request.getLastModified())) {
String lastModified = request.getLastModified(); String lastModified = request.getLastModified();
Date lastModifiedDate = DateUtils.parse(lastModified); Date lastModifiedDate = DateUtils.parse(lastModified);
@ -284,15 +288,19 @@ public class HttpDownloader extends Downloader {
responses.add(response); responses.add(response);
response = response.priorResponse(); response = response.priorResponse();
} }
if (responses.isEmpty()) { if (responses.size() < 2) {
return; return;
} }
Collections.reverse(responses); Collections.reverse(responses);
int firstCode = responses.get(0).code(); int firstCode = responses.get(0).code();
String firstUrl = responses.get(0).request().url().toString();
String secondUrl = responses.get(1).request().url().toString();
if (firstCode == HttpURLConnection.HTTP_MOVED_PERM || firstCode == StatusLine.HTTP_PERM_REDIRECT) { if (firstCode == HttpURLConnection.HTTP_MOVED_PERM || firstCode == StatusLine.HTTP_PERM_REDIRECT) {
String secondUrl = responses.get(1).request().url().toString();
Log.d(TAG, "Detected permanent redirect from " + request.getSource() + " to " + secondUrl); Log.d(TAG, "Detected permanent redirect from " + request.getSource() + " to " + secondUrl);
permanentRedirectUrl = secondUrl; permanentRedirectUrl = secondUrl;
} else if (secondUrl.equals(firstUrl.replace("http://", "https://"))) {
Log.d(TAG, "Treating http->https non-permanent redirect as permanent: " + firstUrl);
permanentRedirectUrl = secondUrl;
} }
} }