From 58df705be6021f1a0d7b8214e5bd08e01ba01d34 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Thu, 2 Apr 2026 18:13:18 +0000
Subject: [PATCH] fix: change Arti SOCKS proxy default port to 17392 and retry
 on busy port

Change default port from 19050 to 17392 to avoid conflicts with other
Tor-using apps. When binding fails (address in use), increment the port
and retry up to 10 times before giving up.

https://claude.ai/code/session_01JEzjceY3ZaCHz5kL4DsKic
---
 .../amethyst/ui/tor/TorManager.kt             |  2 +-
 .../amethyst/ui/tor/TorService.kt             | 25 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorManager.kt
index 2b174560b..fe415a002 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorManager.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorManager.kt
@@ -98,5 +98,5 @@ class TorManager(
 
     fun isSocksReady() = status.value is TorServiceStatus.Active
 
-    fun socksPort(): Int = (status.value as? TorServiceStatus.Active)?.port ?: 19050
+    fun socksPort(): Int = (status.value as? TorServiceStatus.Active)?.port ?: 17392
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt
index 25d31fea1..04540157a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt
@@ -30,7 +30,8 @@ import kotlinx.coroutines.withContext
 import java.io.File
 import java.util.concurrent.atomic.AtomicBoolean
 
-private const val DEFAULT_SOCKS_PORT = 19050
+private const val DEFAULT_SOCKS_PORT = 17392
+private const val MAX_PORT_RETRIES = 10
 
 /**
  * Manages the Arti Tor client via custom JNI bindings.
@@ -46,7 +47,7 @@ private const val DEFAULT_SOCKS_PORT = 19050
 class TorService(
     val context: Context,
 ) {
-    private val socksPort = DEFAULT_SOCKS_PORT
+    private var socksPort = DEFAULT_SOCKS_PORT
     private val initialized = AtomicBoolean(false)
     private val proxyRunning = AtomicBoolean(false)
 
@@ -101,10 +102,22 @@ class TorService(
                 }
             }
 
-            // Start the SOCKS proxy (can be called multiple times safely)
-            val proxyResult = ArtiNative.startSocksProxy(socksPort)
-            if (proxyResult != 0) {
-                Log.e("TorService") { "Failed to start SOCKS proxy: error $proxyResult" }
+            // Start the SOCKS proxy, retrying on next port if address is in use
+            var port = socksPort
+            var started = false
+            for (attempt in 0 until MAX_PORT_RETRIES) {
+                val proxyResult = ArtiNative.startSocksProxy(port)
+                if (proxyResult == 0) {
+                    socksPort = port
+                    started = true
+                    break
+                }
+                Log.w("TorService") { "Port $port in use, trying ${port + 1}" }
+                port++
+            }
+
+            if (!started) {
+                Log.e("TorService") { "Failed to start SOCKS proxy after $MAX_PORT_RETRIES attempts" }
                 _status.value = TorServiceStatus.Off
                 return@withContext
             }