mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-11-10 13:17:34 +01:00
Fix merge
This commit is contained in:
@@ -194,7 +194,6 @@ object Client : RelayPool.Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(DelicateCoroutinesApi::class)
|
|
||||||
override fun onRelayStateChange(
|
override fun onRelayStateChange(
|
||||||
type: Relay.StateType,
|
type: Relay.StateType,
|
||||||
relay: Relay,
|
relay: Relay,
|
||||||
@@ -207,7 +206,6 @@ object Client : RelayPool.Listener {
|
|||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(DelicateCoroutinesApi::class)
|
|
||||||
override fun onSendResponse(
|
override fun onSendResponse(
|
||||||
eventId: String,
|
eventId: String,
|
||||||
success: Boolean,
|
success: Boolean,
|
||||||
@@ -221,7 +219,6 @@ object Client : RelayPool.Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(DelicateCoroutinesApi::class)
|
|
||||||
override fun onAuth(
|
override fun onAuth(
|
||||||
relay: Relay,
|
relay: Relay,
|
||||||
challenge: String,
|
challenge: String,
|
||||||
@@ -231,7 +228,6 @@ object Client : RelayPool.Listener {
|
|||||||
GlobalScope.launch(Dispatchers.Default) { listeners.forEach { it.onAuth(relay, challenge) } }
|
GlobalScope.launch(Dispatchers.Default) { listeners.forEach { it.onAuth(relay, challenge) } }
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(DelicateCoroutinesApi::class)
|
|
||||||
override fun onNotify(
|
override fun onNotify(
|
||||||
relay: Relay,
|
relay: Relay,
|
||||||
description: String,
|
description: String,
|
||||||
@@ -243,7 +239,6 @@ object Client : RelayPool.Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(DelicateCoroutinesApi::class)
|
|
||||||
override fun onSend(
|
override fun onSend(
|
||||||
relay: Relay,
|
relay: Relay,
|
||||||
msg: String,
|
msg: String,
|
||||||
@@ -254,7 +249,6 @@ object Client : RelayPool.Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(DelicateCoroutinesApi::class)
|
|
||||||
override fun onBeforeSend(
|
override fun onBeforeSend(
|
||||||
relay: Relay,
|
relay: Relay,
|
||||||
event: EventInterface,
|
event: EventInterface,
|
||||||
@@ -264,7 +258,6 @@ object Client : RelayPool.Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(DelicateCoroutinesApi::class)
|
|
||||||
override fun onError(
|
override fun onError(
|
||||||
error: Error,
|
error: Error,
|
||||||
subscriptionId: String,
|
subscriptionId: String,
|
||||||
|
|||||||
Reference in New Issue
Block a user