From 918a575cfdc60de779d738857b6c0160cbacd6ce Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 28 Aug 2025 10:24:54 -0400
Subject: [PATCH] Speeds up first time logins by not waiting for Tor

---
 .../src/main/java/com/vitorpamplona/amethyst/Amethyst.kt     | 5 +++--
 .../java/com/vitorpamplona/amethyst/ui/tor/TorSettings.kt    | 2 +-
 .../com/vitorpamplona/amethyst/ui/tor/TorSettingsFlow.kt     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
index b0e7de2fc..038ae36dd 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
@@ -117,10 +117,11 @@ class Amethyst : Application() {
     // Connects the NostrClient class with okHttp
     val websocketBuilder =
         OkHttpWebSocket.Builder { url ->
+            val useTor = torProxySettingsAnchor.useProxy(url)
             if (torProxySettingsAnchor.isDM(url)) {
-                okHttpClientForRelaysForDms.getHttpClient(torProxySettingsAnchor.useProxy(url))
+                okHttpClientForRelaysForDms.getHttpClient(useTor)
             } else {
-                okHttpClientForRelays.getHttpClient(torProxySettingsAnchor.useProxy(url))
+                okHttpClientForRelays.getHttpClient(useTor)
             }
         }
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettings.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettings.kt
index 11edf8e83..88b8f9d5d 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettings.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettings.kt
@@ -27,7 +27,7 @@ class TorSettings(
     val externalSocksPort: Int = 9050,
     val onionRelaysViaTor: Boolean = true,
     val dmRelaysViaTor: Boolean = true,
-    val newRelaysViaTor: Boolean = true,
+    val newRelaysViaTor: Boolean = false,
     val trustedRelaysViaTor: Boolean = false,
     val urlPreviewsViaTor: Boolean = false,
     val profilePicsViaTor: Boolean = false,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettingsFlow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettingsFlow.kt
index bf57fb3d1..e03726f57 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettingsFlow.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettingsFlow.kt
@@ -27,7 +27,7 @@ class TorSettingsFlow(
     val externalSocksPort: MutableStateFlow<Int> = MutableStateFlow(9050),
     val onionRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
     val dmRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
-    val newRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
+    val newRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
     val trustedRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
     val urlPreviewsViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
     val profilePicsViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),