diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt index 2cfa30326..56e25c7dd 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt @@ -103,12 +103,6 @@ class OkHttpWebSocket( incomingMessages.trySendBlocking(text) } - override fun onClosing( - webSocket: okhttp3.WebSocket, - code: Int, - reason: String, - ) = out.onClosing(code, reason) - override fun onClosed( webSocket: okhttp3.WebSocket, code: Int, diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/single/basic/BasicRelayClient.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/single/basic/BasicRelayClient.kt index ed95cf216..62efdae2d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/single/basic/BasicRelayClient.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/single/basic/BasicRelayClient.kt @@ -170,15 +170,6 @@ open class BasicRelayClient( consumeIncomingMessage(text, onConnected) } - override fun onClosing( - code: Int, - reason: String, - ) { - Log.w(logTag, "OnClosing $code $reason") - - listener.onRelayStateChange(this@BasicRelayClient, RelayState.DISCONNECTING) - } - override fun onClosed( code: Int, reason: String, diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/sockets/WebSocketListener.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/sockets/WebSocketListener.kt index 99a099464..5ff71164a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/sockets/WebSocketListener.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/sockets/WebSocketListener.kt @@ -20,6 +20,10 @@ */ package com.vitorpamplona.quartz.nip01Core.relay.sockets +/** + * Interface to abstract the socket implementation. + * Make sure onMessage appears in order of the receipt. + */ interface WebSocketListener { fun onOpen( pingMillis: Int, @@ -28,11 +32,6 @@ interface WebSocketListener { fun onMessage(text: String) - fun onClosing( - code: Int, - reason: String, - ) - fun onClosed( code: Int, reason: String, diff --git a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/sockets/okhttp/BasicOkHttpWebSocket.kt b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/sockets/okhttp/BasicOkHttpWebSocket.kt index 08cb79a42..79a02caf1 100644 --- a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/sockets/okhttp/BasicOkHttpWebSocket.kt +++ b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/sockets/okhttp/BasicOkHttpWebSocket.kt @@ -87,12 +87,6 @@ class BasicOkHttpWebSocket( incomingMessages.trySendBlocking(text) } - override fun onClosing( - webSocket: OkHttpWebSocket, - code: Int, - reason: String, - ) = out.onClosing(code, reason) - override fun onClosed( webSocket: OkHttpWebSocket, code: Int,