From a092e78e8ba6769b5dc9317f0dd373d256afd0d1 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 6 Apr 2026 18:15:21 +0000 Subject: [PATCH] fix: preserve relay order from event instead of sorting by bytes Remove the sortedBy(receivedBytes) from relayListBuilder and Nip65RelayListViewModel.clear() so relays keep their order as stored in the Nostr event. This makes drag-and-drop reordering meaningful since the saved order is now preserved on reload. https://claude.ai/code/session_01RVM5kEJGrCaJTaP3GmVHDd --- .../screen/loggedIn/relays/common/BasicRelaySetupInfoModel.kt | 2 -- .../screen/loggedIn/relays/nip65/Nip65RelayListViewModel.kt | 4 ---- 2 files changed, 6 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/BasicRelaySetupInfoModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/BasicRelaySetupInfoModel.kt index 69ea96b907..86c28e5d34 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/BasicRelaySetupInfoModel.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/BasicRelaySetupInfoModel.kt @@ -132,8 +132,6 @@ abstract class BasicRelaySetupInfoModel : ViewModel() { .useTor(it), ) }.distinctBy { it.relay } - .sortedBy { it.relayStat.receivedBytes } - .reversed() } fun clear() { diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/nip65/Nip65RelayListViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/nip65/Nip65RelayListViewModel.kt index 0313bcff5f..535b87c151 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/nip65/Nip65RelayListViewModel.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/nip65/Nip65RelayListViewModel.kt @@ -176,8 +176,6 @@ class Nip65RelayListViewModel : ViewModel() { relayList .map { relaySetupInfoBuilder(it) } .distinctBy { it.relay } - .sortedBy { it.relayStat.receivedBytes } - .reversed() } _notificationRelays.update { @@ -186,8 +184,6 @@ class Nip65RelayListViewModel : ViewModel() { relayList .map { relaySetupInfoBuilder(it) } .distinctBy { it.relay } - .sortedBy { it.relayStat.receivedBytes } - .reversed() } }