Merge branch 'gabr/socks5fix' into 'master'

Handle "socks5" proxy urls correctly See merge request AuroraOSS/AuroraStore!381
2024-09-26 15:50:29 +00:00
parent d157fdcbcb b2238af5e6
commit bbd9eb0ccb
1 changed files with 1 additions and 1 deletions
--- a/app/src/main/java/com/aurora/store/data/network/OkHttpClientModule.kt
+++ b/app/src/main/java/com/aurora/store/data/network/OkHttpClientModule.kt
@@ -88,7 +88,7 @@ object OkHttpClientModule {
            val proxyInfo = gson.fromJson(proxyInfoString, ProxyInfo::class.java)

            val proxy = Proxy(
-                if (proxyInfo.protocol == "SOCKS") Proxy.Type.SOCKS else Proxy.Type.HTTP,
+                if (proxyInfo.protocol.removeSuffix("5") == "SOCKS") Proxy.Type.SOCKS else Proxy.Type.HTTP,
                InetSocketAddress.createUnresolved(proxyInfo.host, proxyInfo.port)
            )