From a23cbd1a388477c3572dce5da3eab2ed7325c68f Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Tue, 18 Jun 2024 18:21:27 -0400 Subject: [PATCH] Formatting --- .../amethyst/service/relays/Relay.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 8bb9f95f6..ab7108d84 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 @@ -87,9 +87,7 @@ class Relay( listeners = listeners.minus(listener) } - fun isConnected(): Boolean { - return socket != null - } + fun isConnected(): Boolean = socket != null fun connect() { connectAndRun { @@ -123,7 +121,8 @@ class Relay( lastConnectTentative = TimeUtils.now() val request = - Request.Builder() + Request + .Builder() .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}") .url(url.trim()) .build() @@ -141,7 +140,9 @@ class Relay( } } - inner class RelayListener(val onConnected: (Relay) -> Unit) : WebSocketListener() { + inner class RelayListener( + val onConnected: (Relay) -> Unit, + ) : WebSocketListener() { override fun onOpen( webSocket: WebSocket, response: Response, @@ -524,12 +525,11 @@ class Relay( writeToSocket("""["CLOSE","$subscriptionId"]""") } - fun isSameRelayConfig(other: RelaySetupInfo): Boolean { - return url == other.url && + fun isSameRelayConfig(other: RelaySetupInfo): Boolean = + url == other.url && write == other.write && read == other.read && activeTypes == other.feedTypes - } enum class StateType { // Websocket connected