nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes bug on opening the Relay Settings page with duplicated Trusted and Blocked relays.

Browse Source
This commit is contained in:
Vitor Pamplona
2025-08-31 11:13:56 -04:00
parent 1112fa96aa
commit 408a9725e0
11 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/blocked/BlockedRelayListView.kt
+1 -1
View File
@@ -65,7 +65,7 @@ fun LazyListScope.renderBlockedItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Trusted" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Blocked" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteRelay(item) },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/broadcast/BroadcastRelayListView.kt
+1 -1
View File
@@ -65,7 +65,7 @@ fun LazyListScope.renderBroadcastItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Broadcast" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Broadcast" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteRelay(item) },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/connected/ConnectedRelayListView.kt
+1 -1
View File
@@ -60,7 +60,7 @@ fun LazyListScope.renderConnectedItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Connected" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Connected" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = null,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/dm/DMRelayListView.kt
+1 -1
View File
@@ -64,7 +64,7 @@ fun LazyListScope.renderDMItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "DM" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "DM" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteRelay(item) },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/indexer/IndexerRelayListView.kt
+1 -1
View File
@@ -65,7 +65,7 @@ fun LazyListScope.renderIndexerItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Indexer" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Indexer" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteRelay(item) },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/local/LocalRelayListView.kt
+1 -1
View File
@@ -64,7 +64,7 @@ fun LazyListScope.renderLocalItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Local" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Local" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteRelay(item) },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/nip37/PrivateOutboxRelayListView.kt
+1 -1
View File
@@ -64,7 +64,7 @@ fun LazyListScope.renderPrivateOutboxItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Outbox" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Outbox" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteRelay(item) },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/nip65/Nip65RelayListView.kt
+2 -2
View File
@@ -67,7 +67,7 @@ fun LazyListScope.renderNip65HomeItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Nip65Home" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Nip65Home" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteHomeRelay(item) },
@@ -88,7 +88,7 @@ fun LazyListScope.renderNip65NotifItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Nip65Notif" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Nip65Notif" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteNotifRelay(item) },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/proxy/ProxyRelayListView.kt
+1 -1
View File
@@ -65,7 +65,7 @@ fun LazyListScope.renderProxyItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Proxy" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Proxy" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteRelay(item) },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/search/SearchRelayListView.kt
+1 -1
View File
@@ -65,7 +65,7 @@ fun LazyListScope.renderSearchItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Search" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Search" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteRelay(item) },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/trusted/TrustedRelayListView.kt
+1 -1
View File
@@ -65,7 +65,7 @@ fun LazyListScope.renderTrustedItems(
accountViewModel: AccountViewModel,
nav: INav,
) {
itemsIndexed(feedState, key = { _, item -> "Trusted" + item.relay }) { index, item ->
itemsIndexed(feedState, key = { _, item -> "Trusted" + item.relay.url }) { index, item ->
BasicRelaySetupInfoDialog(
item,
onDelete = { postViewModel.deleteRelay(item) },