nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes bug that every socket is null

Browse Source
This commit is contained in:
Vitor Pamplona
2024-06-03 14:04:29 -04:00
parent 09d2e9593e
commit 467e5c0e4a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
+4 -3
View File
@@ -226,11 +226,9 @@ class Relay(
checkNotInMainThread() checkNotInMainThread()
socket?.cancel() // 1000, "Normal close" 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. // 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) RelayStats.newError(url, response?.message ?: t.message)
Log.w("Relay", "Relay onFailure $url, ${response?.message} $response ${t.message} $socket") Log.w("Relay", "Relay onFailure $url, ${response?.message} $response ${t.message} $socket")
@@ -243,6 +241,9 @@ class Relay(
) )
} }
} }
// Failures disconnect the relay.
markConnectionAsClosed()
} }
} }