Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2051 from mfietz/issue/2017-2-no-content-type

Browse Source 
Downloader: Check content-type for null
This commit is contained in:
Martin Fietz 2016-06-29 15:26:12 +02:00 committed by GitHub
commit de8c3a6ae6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,8 +185,6 @@ public class HttpDownloader extends Downloader {
// fail with a file type error when the content type is text and
// the reported content length is less than 100kb (or no length is given)
if(request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
String contentType = response.header("Content-Type");
Log.d(TAG, "content type: " + contentType);
int contentLength = -1;
String contentLen = response.header("Content-Length");
if(contentLen != null) {
@ -195,7 +193,10 @@ public class HttpDownloader extends Downloader {
} catch(NumberFormatException e) {}
}
Log.d(TAG, "content length: " + contentLength);
if(contentType.startsWith("text/") && contentLength < 100 * 1024) {
String contentType = response.header("Content-Type");
Log.d(TAG, "content type: " + contentType);
if(contentType != null && contentType.startsWith("text/") &&
contentLength < 100 * 1024) {
onFail(DownloadError.ERROR_FILE_TYPE, null);
return;
}