From b55cdda52a5911fa232c44e2a55bd0e71d95a43f Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Mon, 6 Oct 2025 14:42:25 -0400
Subject: [PATCH] Makes the order of the Tor Relay settings match across data
 objects

---
 .../amethyst/model/torState/TorRelaySettings.kt             | 2 +-
 .../vitorpamplona/amethyst/model/torState/TorRelayState.kt  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelaySettings.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelaySettings.kt
index e33477d052..b0dc31d599 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelaySettings.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelaySettings.kt
@@ -26,6 +26,6 @@ data class TorRelaySettings(
     val torType: TorType = TorType.OFF,
     val onionRelaysViaTor: Boolean = true,
     val dmRelaysViaTor: Boolean = false,
-    val trustedRelaysViaTor: Boolean = false,
     val newRelaysViaTor: Boolean = false,
+    val trustedRelaysViaTor: Boolean = false,
 )
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelayState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelayState.kt
index ae9dcd791f..9480564e3e 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelayState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelayState.kt
@@ -61,8 +61,8 @@ class TorRelayState(
                 torType = torType,
                 onionRelaysViaTor = onionRelaysViaTor,
                 dmRelaysViaTor = dmRelaysViaTor,
-                trustedRelaysViaTor = trustedRelaysViaTor,
                 newRelaysViaTor = newRelaysViaTor,
+                trustedRelaysViaTor = trustedRelaysViaTor,
             )
         }.onStart {
             emit(
@@ -70,8 +70,8 @@ class TorRelayState(
                     torType = torSettingsFlow.torType.value,
                     onionRelaysViaTor = torSettingsFlow.onionRelaysViaTor.value,
                     dmRelaysViaTor = torSettingsFlow.dmRelaysViaTor.value,
-                    trustedRelaysViaTor = torSettingsFlow.trustedRelaysViaTor.value,
                     newRelaysViaTor = torSettingsFlow.newRelaysViaTor.value,
+                    trustedRelaysViaTor = torSettingsFlow.trustedRelaysViaTor.value,
                 ),
             )
         }.flowOn(Dispatchers.Default)
@@ -82,8 +82,8 @@ class TorRelayState(
                     torType = torSettingsFlow.torType.value,
                     onionRelaysViaTor = torSettingsFlow.onionRelaysViaTor.value,
                     dmRelaysViaTor = torSettingsFlow.dmRelaysViaTor.value,
-                    trustedRelaysViaTor = torSettingsFlow.trustedRelaysViaTor.value,
                     newRelaysViaTor = torSettingsFlow.newRelaysViaTor.value,
+                    trustedRelaysViaTor = torSettingsFlow.trustedRelaysViaTor.value,
                 ),
             )