Peertube/NewPipe-app-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #11969 from neosis91/dev

Browse Source 
DownloaderImpl: Auto-close resources and simplify header setting
This commit is contained in:
Profpatsch 2025-01-31 15:56:39 +01:00 committed by GitHub
commit ba86ce137b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
View File

@ -137,7 +137,8 @@ public final class DownloaderImpl extends Downloader {
} }
final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder() final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
.method(httpMethod, requestBody).url(url) .method(httpMethod, requestBody)
.url(url)
.addHeader("User-Agent", USER_AGENT); .addHeader("User-Agent", USER_AGENT);
final String cookies = getCookies(url); final String cookies = getCookies(url);
@ -145,38 +146,33 @@ public final class DownloaderImpl extends Downloader {
requestBuilder.addHeader("Cookie", cookies); requestBuilder.addHeader("Cookie", cookies);
} }
for (final Map.Entry<String, List<String>> pair : headers.entrySet()) { headers.forEach((headerName, headerValueList) -> {
final String headerName = pair.getKey(); requestBuilder.removeHeader(headerName);
final List<String> headerValueList = pair.getValue(); headerValueList.forEach(headerValue ->
requestBuilder.addHeader(headerName, headerValue));
});
if (headerValueList.size() > 1) { try (
requestBuilder.removeHeader(headerName); okhttp3.Response response = client.newCall(requestBuilder.build()).execute()
for (final String headerValue : headerValueList) { ) {
requestBuilder.addHeader(headerName, headerValue); if (response.code() == 429) {
} throw new ReCaptchaException("reCaptcha Challenge requested", url);
} else if (headerValueList.size() == 1) {
requestBuilder.header(headerName, headerValueList.get(0));
} }
String responseBodyToReturn = null;
try (ResponseBody body = response.body()) {
if (body != null) {
responseBodyToReturn = body.string();
}
}
final String latestUrl = response.request().url().toString();
return new Response(
response.code(),
response.message(),
response.headers().toMultimap(),
responseBodyToReturn,
latestUrl);
} }
final okhttp3.Response response = client.newCall(requestBuilder.build()).execute();
if (response.code() == 429) {
response.close();
throw new ReCaptchaException("reCaptcha Challenge requested", url);
}
final ResponseBody body = response.body();
String responseBodyToReturn = null;
if (body != null) {
responseBodyToReturn = body.string();
}
final String latestUrl = response.request().url().toString();
return new Response(response.code(), response.message(), response.headers().toMultimap(),
responseBodyToReturn, latestUrl);
} }
} }