From c7b2c201198166a47827bc8dbc0b21c37ee406b4 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Wed, 24 Jan 2024 17:18:25 -0300
Subject: [PATCH] recreate httpclient when changing the proxy or timeout

---
 .../main/java/com/vitorpamplona/amethyst/service/HttpClient.kt | 3 +++
 .../java/com/vitorpamplona/amethyst/service/relays/Relay.kt    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt
index 7645f8e1e..64c77e914 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt
+++ b/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()
         }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
index 9b9c667f0..08617f8fb 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
+++ b/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