From 467e5c0e4a01f2278bee00a25c23a3ed710bb4c6 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Mon, 3 Jun 2024 14:04:29 -0400
Subject: [PATCH] Fixes bug that every socket is null

---
 .../com/vitorpamplona/amethyst/service/relays/Relay.kt     | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 32c7e7cf0..5e5f10638 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
@@ -226,11 +226,9 @@ class Relay(
             checkNotInMainThread()
 
             socket?.cancel() // 1000, "Normal close"
-            // Failures disconnect the relay.
-            markConnectionAsClosed()
 
             // checks if this is an actual failure. Closing the socket generates an onFailure as well.
-            if (!(socket == null && t.message == "Socket closed")) {
+            if (!(socket == null && (t.message == "Socket is closed" || t.message == "Socket closed"))) {
                 RelayStats.newError(url, response?.message ?: t.message)
 
                 Log.w("Relay", "Relay onFailure $url, ${response?.message} $response ${t.message} $socket")
@@ -243,6 +241,9 @@ class Relay(
                     )
                 }
             }
+
+            // Failures disconnect the relay.
+            markConnectionAsClosed()
         }
     }