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

Merge pull request #1447 from mfietz/issue/1445-relative-location 

Handle redirects with relative URL correctly 2.0
This commit is contained in:
Tom Hennen 2015-12-12 08:37:11 -05:00
parent c0f15653d4 5600080229
commit 2f1dc0fc59
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
View File

@ -75,14 +75,14 @@ public class AntennapodHttpClient {
if(location.startsWith("/")) { // URL is not absolute, but relative
URL url = request.url();
location = url.getProtocol() + "://" + url.getHost() + location;
} else if(!location.startsWith("http://") && !location.startsWith("https://")) {
} else if(!location.toLowerCase().startsWith("http://") &&
!location.toLowerCase().startsWith("https://")) {
// Reference is relative to current path
URL url = request.url();
String path = url.getPath();
String newPath = path.substring(0, path.lastIndexOf("/") + 1) + location;
location = url.getProtocol() + "://" + url.getHost() + newPath;
}
Log.d(TAG, "New location: " + location);
try {
DBWriter.updateFeedDownloadURL(request.urlString(), location).get();
} catch (Exception e) {