Merge pull request #5151 from ByteHamster/fix-proxy

Fixed proxy support

1 files changed, 6 insertions, 7 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
index 4d1d44908..93a58af06 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
@@ -118,14 +118,13 @@ public class AntennapodHttpClient {
         if (config.type != Proxy.Type.DIRECT) {
             int port = config.port > 0 ? config.port : ProxyConfig.DEFAULT_PORT;
             SocketAddress address = InetSocketAddress.createUnresolved(config.host, port);
-            Proxy proxy = new Proxy(config.type, address);
-            builder.proxy(proxy);
+            builder.proxy(new Proxy(config.type, address));
             if (!TextUtils.isEmpty(config.username) && config.password != null) {
-                String credentials = Credentials.basic(config.username, config.password);
-                builder.interceptors().add(chain -> {
-                    Request request = chain.request().newBuilder()
-                            .header("Proxy-Authorization", credentials).build();
-                    return chain.proceed(request);
+                builder.proxyAuthenticator((route, response) -> {
+                    String credentials = Credentials.basic(config.username, config.password);
+                    return response.request().newBuilder()
+                            .header("Proxy-Authorization", credentials)
+                            .build();
                 });
             }
         }