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

Fixes some connectivity issues by basing the timeout from the last connection tentative instead of the drop out time.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-02-02 16:08:36 -05:00
parent 4be4306540
commit c78239a6b7
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ class Relay(
var errorCounter = 0 var errorCounter = 0
var pingInMs: Long? = null var pingInMs: Long? = null
var closingTimeInSeconds = 0L var lastConnectTentative: Long = 0L
var afterEOSEPerSubscription = mutableMapOf<String, Boolean>() var afterEOSEPerSubscription = mutableMapOf<String, Boolean>()
@ -120,6 +120,8 @@ class Relay(
if (socket != null) return if (socket != null) return
lastConnectTentative = TimeUtils.now()
try { try {
val request = val request =
Request.Builder() Request.Builder()
@ -251,7 +253,6 @@ class Relay(
this.isReady = false this.isReady = false
this.usingCompression = false this.usingCompression = false
this.resetEOSEStatuses() this.resetEOSEStatuses()
this.closingTimeInSeconds = TimeUtils.now()
} }
fun processNewRelayMessage(newMessage: String) { fun processNewRelayMessage(newMessage: String) {
@ -331,7 +332,7 @@ class Relay(
Log.d("Relay", "Relay.disconnect $url") Log.d("Relay", "Relay.disconnect $url")
checkNotInMainThread() checkNotInMainThread()
closingTimeInSeconds = TimeUtils.now() lastConnectTentative = 0L // this is not an error, so prepare to reconnect as soon as requested.
socket?.cancel() socket?.cancel()
socket = null socket = null
isReady = false isReady = false
@ -373,7 +374,7 @@ class Relay(
} }
} else { } else {
// waits 60 seconds to reconnect after disconnected. // waits 60 seconds to reconnect after disconnected.
if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) { if (TimeUtils.now() > lastConnectTentative + RECONNECTING_IN_SECONDS) {
// sends all filters after connection is successful. // sends all filters after connection is successful.
connect() connect()
} }
@ -413,7 +414,7 @@ class Relay(
if (socket == null) { if (socket == null) {
// waits 60 seconds to reconnect after disconnected. // waits 60 seconds to reconnect after disconnected.
if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) { if (TimeUtils.now() > lastConnectTentative + RECONNECTING_IN_SECONDS) {
// println("sendfilter Only if Disconnected ${url} ") // println("sendfilter Only if Disconnected ${url} ")
connect() connect()
} }