highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-04-04 01:48:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Quick refactoring

Browse Source
This commit is contained in:
Vitor Pamplona 2023-02-05 12:58:26 -05:00
parent c5aa57d91b
commit 5c5aa222c5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt
View File

@ -41,7 +41,6 @@ object Client: RelayPool.Listener {
subscriptions = subscriptions + Pair(subscriptionId, filters)
RelayPool.sendFilter(subscriptionId)
}
fun sendFilterOnlyIfDisconnected(
subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
filters: List<JsonFilter> = listOf(JsonFilter())

13
app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
View File

@ -159,12 +159,7 @@ class Relay(
fun sendFilter(requestId: String) {
if (read) {
if (socket == null) {
// waits 10 seconds
if (Date().time / 1000 > closingTime + 10) {
requestAndWatch()
}
} else {
if (isConnected()) {
if (isReady) {
val filters = Client.getSubscriptionFilters(requestId)
if (filters.isNotEmpty()) {
@ -174,6 +169,12 @@ class Relay(
socket?.send(request)
}
}
} else {
// waits 10 seconds to reconnect after disconnected.
if (Date().time / 1000 > closingTime + 10) {
// sends all filters after connection is successful.
requestAndWatch()
}
}
}
}