From f10dd38126d90bf5ed7077af3510c3b14cad955e Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 21 Feb 2024 10:04:40 -0500 Subject: [PATCH] refactoring on method names to make them clearer --- .../java/com/vitorpamplona/amethyst/service/relays/Client.kt | 4 ++-- .../java/com/vitorpamplona/amethyst/service/relays/Relay.kt | 2 +- .../com/vitorpamplona/amethyst/service/relays/RelayPool.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt index 3f0283fc7..4bf85b83a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt @@ -108,7 +108,7 @@ object Client : RelayPool.Listener { checkNotInMainThread() subscriptions = subscriptions + Pair(subscriptionId, filters) - RelayPool.sendFilterOnlyIfDisconnected(subscriptionId) + RelayPool.connectAndSendFiltersIfDisconnected() } fun send( @@ -292,7 +292,7 @@ object Client : RelayPool.Listener { open fun onRelayStateChange( type: Relay.StateType, relay: Relay, - channel: String?, + subscriptionId: String?, ) = Unit /** When an relay saves or rejects a new event. */ diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt index cdb428eae..04a6aaaa2 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt @@ -409,7 +409,7 @@ class Relay( return buffer.toString() } - fun sendFilterOnlyIfDisconnected(subscriptionId: String) { + fun connectAndSendFiltersIfDisconnected() { checkNotInMainThread() if (socket == null) { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt index 89fe955be..08135e9bb 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt @@ -81,8 +81,8 @@ object RelayPool : Relay.Listener { relays.forEach { it.sendFilter(subscriptionId) } } - fun sendFilterOnlyIfDisconnected(subscriptionId: String) { - relays.forEach { it.sendFilterOnlyIfDisconnected(subscriptionId) } + fun connectAndSendFiltersIfDisconnected() { + relays.forEach { it.connectAndSendFiltersIfDisconnected() } } fun sendToSelectedRelays(