From 5c5aa222c57d9be37db15f51617d2db986d30400 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Sun, 5 Feb 2023 12:58:26 -0500
Subject: [PATCH] Quick refactoring

---
 .../vitorpamplona/amethyst/service/relays/Client.kt |  1 -
 .../vitorpamplona/amethyst/service/relays/Relay.kt  | 13 +++++++------
 2 files changed, 7 insertions(+), 7 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 8de2563da..b5f6ae751 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
@@ -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())
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 fe832e2f0..36fc75847 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
@@ -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()
+                }
             }
         }
     }