FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a single instance of OkHttp everywhere

Browse Source
This commit is contained in:
Shinokuni 2020-01-26 14:09:33 +01:00
parent cb0decd901
commit c50c8a96e8
3 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQuery.java
View File

@ -7,7 +7,7 @@ import com.readrops.readropslibrary.localfeed.atom.ATOMFeed;
import com.readrops.readropslibrary.localfeed.json.JSONFeed; import com.readrops.readropslibrary.localfeed.json.JSONFeed;
import com.readrops.readropslibrary.localfeed.rss.RSSFeed; import com.readrops.readropslibrary.localfeed.rss.RSSFeed;
import com.readrops.readropslibrary.localfeed.rss.RSSLink; import com.readrops.readropslibrary.localfeed.rss.RSSLink;
import com.readrops.readropslibrary.utils.HttpBuilder; import com.readrops.readropslibrary.utils.HttpManager;
import com.readrops.readropslibrary.utils.LibUtils; import com.readrops.readropslibrary.utils.LibUtils;
import com.readrops.readropslibrary.utils.UnknownFormatException; import com.readrops.readropslibrary.utils.UnknownFormatException;
import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.JsonAdapter;
@ -75,7 +75,8 @@ public class RSSQuery {
} }
private Response query(String url, Map<String, String> headers) throws IOException { private Response query(String url, Map<String, String> headers) throws IOException {
OkHttpClient okHttpClient = HttpBuilder.getBuilder().build(); OkHttpClient okHttpClient = HttpManager.getInstance().getOkHttpClient();
HttpManager.getInstance().setCredentials(null);
Request.Builder builder = new Request.Builder().url(url); Request.Builder builder = new Request.Builder().url(url);
for (String header : headers.keySet()) { for (String header : headers.keySet()) {

23
readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpBuilder.java
View File

@ -1,23 +0,0 @@
package com.readrops.readropslibrary.utils;
import java.util.concurrent.TimeUnit;
import okhttp3.OkHttpClient;
public final class HttpBuilder {
private static OkHttpClient.Builder builder;
public static OkHttpClient.Builder getBuilder() {
if (builder == null)
builder = createOkHttpBuilder();
return builder;
}
private static OkHttpClient.Builder createOkHttpBuilder() {
return new OkHttpClient.Builder()
.callTimeout(30, TimeUnit.SECONDS)
.readTimeout(1, TimeUnit.HOURS);
}
}

6
readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpManager.java
View File

@ -1,5 +1,7 @@
package com.readrops.readropslibrary.utils; package com.readrops.readropslibrary.utils;
import androidx.annotation.Nullable;
import com.readrops.readropslibrary.services.Credentials; import com.readrops.readropslibrary.services.Credentials;
import java.io.IOException; import java.io.IOException;
@ -31,7 +33,7 @@ public class HttpManager {
return okHttpClient; return okHttpClient;
} }
public void setCredentials(Credentials credentials) { public void setCredentials(@Nullable Credentials credentials) {
this.credentials = credentials; this.credentials = credentials;
} }
@ -63,7 +65,7 @@ public class HttpManager {
public Response intercept(Chain chain) throws IOException { public Response intercept(Chain chain) throws IOException {
Request request = chain.request(); Request request = chain.request();
if (credentials.getAuthorization() != null) { if (credentials != null && credentials.getAuthorization() != null) {
request = request.newBuilder() request = request.newBuilder()
.addHeader("Authorization", credentials.getAuthorization()) .addHeader("Authorization", credentials.getAuthorization())
.build(); .build();