From c50c8a96e84656e66a4a4d1ac3d8df9cb01ea6e6 Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Sun, 26 Jan 2020 14:09:33 +0100
Subject: [PATCH] Use a single instance of OkHttp everywhere

---
 .../readropslibrary/localfeed/RSSQuery.java   |  5 ++--
 .../readropslibrary/utils/HttpBuilder.java    | 23 -------------------
 .../readropslibrary/utils/HttpManager.java    |  6 +++--
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpBuilder.java

diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQuery.java b/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQuery.java
index 3619de15..b13d382a 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQuery.java
+++ b/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQuery.java
@@ -7,7 +7,7 @@ import com.readrops.readropslibrary.localfeed.atom.ATOMFeed;
 import com.readrops.readropslibrary.localfeed.json.JSONFeed;
 import com.readrops.readropslibrary.localfeed.rss.RSSFeed;
 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.UnknownFormatException;
 import com.squareup.moshi.JsonAdapter;
@@ -75,7 +75,8 @@ public class RSSQuery {
     }
 
     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);
         for (String header : headers.keySet()) {
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpBuilder.java b/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpBuilder.java
deleted file mode 100644
index e905d318..00000000
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpBuilder.java
+++ /dev/null
@@ -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);
-    }
-}
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpManager.java b/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpManager.java
index b317fe3f..2a9bde36 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpManager.java
+++ b/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpManager.java
@@ -1,5 +1,7 @@
 package com.readrops.readropslibrary.utils;
 
+import androidx.annotation.Nullable;
+
 import com.readrops.readropslibrary.services.Credentials;
 
 import java.io.IOException;
@@ -31,7 +33,7 @@ public class HttpManager {
         return okHttpClient;
     }
 
-    public void setCredentials(Credentials credentials) {
+    public void setCredentials(@Nullable Credentials credentials) {
         this.credentials = credentials;
     }
 
@@ -63,7 +65,7 @@ public class HttpManager {
         public Response intercept(Chain chain) throws IOException {
             Request request = chain.request();
 
-            if (credentials.getAuthorization() != null) {
+            if (credentials != null && credentials.getAuthorization() != null) {
                 request = request.newBuilder()
                         .addHeader("Authorization", credentials.getAuthorization())
                         .build();