Merge pull request #753 from greenart7c3/proxy_fix

Recreate http client when changing the proxy or timeout

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

@@ -51,6 +51,8 @@ object HttpClient {
 
     fun start(proxy: Proxy?) {
         if (internalProxy != proxy) {
+            Log.d("HttpClient", "Changing proxy to: ${proxy != null}")
+            this.defaultHttpClient = null
             this.internalProxy = proxy
             this.defaultHttpClient = getHttpClient()
         }
@@ -59,6 +61,7 @@ object HttpClient {
     fun changeTimeouts(timeout: Duration) {
         Log.d("HttpClient", "Changing timeout to: $timeout")
         if (this.defaultTimeout.seconds != timeout.seconds) {
+            this.defaultHttpClient = null
             this.defaultTimeout = timeout
             this.defaultHttpClient = getHttpClient()
         }

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

@@ -106,7 +106,7 @@ class Relay(
     private var connectingBlock = AtomicBoolean()
 
     fun connectAndRun(onConnected: (Relay) -> Unit) {
-        Log.d("Relay", "Relay.connect $url")
+        Log.d("Relay", "Relay.connect $url hasProxy: ${this.httpClient.proxy != null}")
         // BRB is crashing OkHttp Deflater object :(
         if (url.contains("brb.io")) return