From 8b4b060425a23c75877c53018dc971233415ab0a Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 13 Feb 2023 17:28:17 +0800 Subject: [PATCH] Revert "Ktor CIO Client Proxy" This reverts commit 4419ab154bb0b811da05c5c233995fb4acc60cde. --- .../java/com/hippo/ehviewer/EhApplication.kt | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index cf1c7c3df..99767e173 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -62,8 +62,6 @@ import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import okhttp3.OkHttpClient -import java.net.InetAddress -import java.net.InetSocketAddress import java.net.Proxy import java.security.KeyStore import java.util.Arrays @@ -314,20 +312,6 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor val ktorClient by lazy { HttpClient(CIO) { engine { - proxy = when (Settings.getProxyType()) { - EhProxySelector.TYPE_DIRECT -> Proxy.NO_PROXY - EhProxySelector.TYPE_SYSTEM -> null - EhProxySelector.TYPE_HTTP -> { - val ip = Settings.getProxyIp() - val port = Settings.getProxyPort() - val iNetAddress = InetAddress.getByName(ip) - val socketAddress = InetSocketAddress(iNetAddress, port) - Proxy(Proxy.Type.HTTP, socketAddress) - } - - // CIO does not support Socks proxy yet - else -> null - } https { serverName = "0.0.0.0".takeIf { Settings.getDF() } trustManager = EhX509TrustManager