diff options
author | ByteHamster <info@bytehamster.com> | 2022-02-19 13:46:12 +0100 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2022-02-19 13:46:12 +0100 |
commit | acb384b128c00580878b55aeb8dfdede7e3dc0cc (patch) | |
tree | 9e1b9b774fcc0ac90bb24cc4ca6eda95d1943f02 /core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java | |
parent | 6273dff85f4b9bba233ddf5d30ea36b617b09334 (diff) | |
parent | f4c90885d7e60089bfd94f10b09895a477f33187 (diff) | |
download | antennapod-acb384b128c00580878b55aeb8dfdede7e3dc0cc.zip |
Merge branch 'master' into develop
Diffstat (limited to 'core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java | 2 |
1 files changed, 1 insertions, 1 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 bca3792b0..b26c57963 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,7 +118,7 @@ public class AntennapodHttpClient { builder.followSslRedirects(true); ProxyConfig config = UserPreferences.getProxyConfig(); - if (config.type != Proxy.Type.DIRECT) { + if (config.type != Proxy.Type.DIRECT && !TextUtils.isEmpty(config.host)) { int port = config.port > 0 ? config.port : ProxyConfig.DEFAULT_PORT; SocketAddress address = InetSocketAddress.createUnresolved(config.host, port); builder.proxy(new Proxy(config.type, address)); |