Merge pull request #832 from greenart7c3/main

Do not use tor proxy when localhost, fix proxy not being used inside ImageDownloader.kt

app/src/main/java/com/vitorpamplona/amethyst/service/HttpClientManager.kt

@@ -39,6 +39,7 @@ object HttpClientManager {
     var proxyChangeListeners = ArrayList<() -> Unit>()
     private var defaultTimeout = DEFAULT_TIMEOUT_ON_WIFI
     private var defaultHttpClient: OkHttpClient? = null
+    private var defaultHttpClientWithoutProxy: OkHttpClient? = null
 
     // fires off every time value of the property changes
     private var internalProxy: Proxy? by
@@ -58,6 +59,10 @@ object HttpClientManager {
         }
     }
 
+    fun getDefaultProxy(): Proxy? {
+        return this.internalProxy
+    }
+
     fun setDefaultTimeout(timeout: Duration) {
         Log.d("HttpClient", "Changing timeout to: $timeout")
         if (this.defaultTimeout.seconds != timeout.seconds) {
@@ -98,11 +103,18 @@ object HttpClientManager {
         }
     }
 
-    fun getHttpClient(): OkHttpClient {
-        if (this.defaultHttpClient == null) {
-            this.defaultHttpClient = buildHttpClient(internalProxy, defaultTimeout)
+    fun getHttpClient(useProxy: Boolean = true): OkHttpClient {
+        return if (useProxy) {
+            if (this.defaultHttpClient == null) {
+                this.defaultHttpClient = buildHttpClient(internalProxy, defaultTimeout)
+            }
+            defaultHttpClient!!
+        } else {
+            if (this.defaultHttpClientWithoutProxy == null) {
+                this.defaultHttpClientWithoutProxy = buildHttpClient(null, defaultTimeout)
+            }
+            defaultHttpClientWithoutProxy!!
         }
-        return defaultHttpClient!!
     }
 
     fun initProxy(

app/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt

@@ -121,8 +121,9 @@ class Nip11Retriever {
         try {
             val request: Request =
                 Request.Builder().header("Accept", "application/nostr+json").url(url).build()
+            val isLocalHost = dirtyUrl.startsWith("ws://127.0.0.1") || dirtyUrl.startsWith("ws://localhost")
 
-            HttpClientManager.getHttpClient()
+            HttpClientManager.getHttpClient(useProxy = !isLocalHost)
                 .newCall(request)
                 .enqueue(
                     object : Callback {

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt

@@ -63,7 +63,12 @@ class Relay(
         const val RECONNECTING_IN_SECONDS = 60 * 3
     }
 
-    private val httpClient = HttpClientManager.getHttpClient()
+    private val httpClient =
+        if (url.startsWith("ws://127.0.0.1") || url.startsWith("ws://localhost")) {
+            HttpClientManager.getHttpClient(false)
+        } else {
+            HttpClientManager.getHttpClient()
+        }
 
     private var listeners = setOf<Listener>()
     private var socket: WebSocket? = null

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt

@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.ui.actions
 
+import com.vitorpamplona.amethyst.service.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import java.net.HttpURLConnection
@@ -36,7 +37,12 @@ class ImageDownloader {
                 try {
                     HttpURLConnection.setFollowRedirects(true)
                     var url = URL(imageUrl)
-                    var huc = url.openConnection() as HttpURLConnection
+                    var huc =
+                        if (HttpClientManager.getDefaultProxy() != null) {
+                            url.openConnection(HttpClientManager.getDefaultProxy()) as HttpURLConnection
+                        } else {
+                            url.openConnection() as HttpURLConnection
+                        }
                     huc.instanceFollowRedirects = true
                     var responseCode = huc.responseCode
 
@@ -45,7 +51,12 @@ class ImageDownloader {
 
                         // open the new connnection again
                         url = URL(newUrl)
-                        huc = url.openConnection() as HttpURLConnection
+                        huc =
+                            if (HttpClientManager.getDefaultProxy() != null) {
+                                url.openConnection(HttpClientManager.getDefaultProxy()) as HttpURLConnection
+                            } else {
+                                url.openConnection() as HttpURLConnection
+                            }
                         responseCode = huc.responseCode
                     }