From 1e61162f73d9706f77253c7d120a9a8f80eb4158 Mon Sep 17 00:00:00 2001
From: David Kaspar <david.kaspar@gmail.com>
Date: Sun, 1 Sep 2024 17:05:20 +0200
Subject: [PATCH 1/2] change the logic for saving of proxy state

---
 .../java/com/vitorpamplona/amethyst/model/AccountSettings.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
index 2959e4d6cf..db09d95b60 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
@@ -252,7 +252,7 @@ class AccountSettings(
         portNumber: String,
     ) {
         val port = portNumber.toIntOrNull() ?: return
-        if (proxyPort != port && isProxyEnabled() != enabled) {
+        if (proxyPort != port || isProxyEnabled() != enabled) {
             proxyPort = portNumber.toInt()
             proxy = HttpClientManager.initProxy(enabled, "127.0.0.1", proxyPort)
             saveAccountSettings()

From 9fa1b8c541e702fc243b48e2609d39c6b9e6c1f8 Mon Sep 17 00:00:00 2001
From: David Kaspar <david.kaspar@gmail.com>
Date: Sun, 1 Sep 2024 17:09:03 +0200
Subject: [PATCH 2/2] Close "needsPassword.value" if statement earlier to make
 Orbot checkbox visible again

---
 .../ui/screen/loggedOff/LoginScreen.kt        | 67 +++++++++----------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt
index def057141b..21692379a7 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt
@@ -472,43 +472,42 @@ fun LoginPage(
                         },
                     ),
             )
+        }
+        Spacer(modifier = Modifier.height(10.dp))
 
-            Spacer(modifier = Modifier.height(10.dp))
+        if (PackageUtils.isOrbotInstalled(context)) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Checkbox(
+                    checked = useProxy.value,
+                    onCheckedChange = {
+                        if (it) {
+                            connectOrbotDialogOpen = true
+                        }
+                    },
+                )
 
-            if (PackageUtils.isOrbotInstalled(context)) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Checkbox(
-                        checked = useProxy.value,
-                        onCheckedChange = {
-                            if (it) {
-                                connectOrbotDialogOpen = true
-                            }
-                        },
-                    )
+                Text(stringRes(R.string.connect_via_tor))
+            }
 
-                    Text(stringRes(R.string.connect_via_tor))
-                }
-
-                if (connectOrbotDialogOpen) {
-                    ConnectOrbotDialog(
-                        onClose = { connectOrbotDialogOpen = false },
-                        onPost = {
-                            connectOrbotDialogOpen = false
-                            useProxy.value = true
-                        },
-                        onError = {
-                            scope.launch {
-                                Toast
-                                    .makeText(
-                                        context,
-                                        it,
-                                        Toast.LENGTH_LONG,
-                                    ).show()
-                            }
-                        },
-                        proxyPort,
-                    )
-                }
+            if (connectOrbotDialogOpen) {
+                ConnectOrbotDialog(
+                    onClose = { connectOrbotDialogOpen = false },
+                    onPost = {
+                        connectOrbotDialogOpen = false
+                        useProxy.value = true
+                    },
+                    onError = {
+                        scope.launch {
+                            Toast
+                                .makeText(
+                                    context,
+                                    it,
+                                    Toast.LENGTH_LONG,
+                                ).show()
+                        }
+                    },
+                    proxyPort,
+                )
             }
         }