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

Solves race conditions when connecting to relays.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-06-01 15:16:18 -04:00
parent bf71365f51
commit 2326e66382
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
+6 -3
View File
@@ -116,7 +116,7 @@ class Relay(
private var connectingBlock = AtomicBoolean() private var connectingBlock = AtomicBoolean()
fun connectAndRun(onConnected: (Relay) -> Unit) { fun connectAndRun(onConnected: (Relay) -> Unit) {
Log.d("Relay", "Relay.connect $url hasProxy: ${this.httpClient.proxy != null}") Log.d("Relay", "Relay.connect $url connecting: ${connectingBlock.get()} hasProxy: ${this.httpClient.proxy != null}")
// BRB is crashing OkHttp Deflater object :( // BRB is crashing OkHttp Deflater object :(
if (url.contains("brb.io")) return if (url.contains("brb.io")) return
@@ -125,13 +125,16 @@ class Relay(
return return
} }
try {
checkNotInMainThread() checkNotInMainThread()
if (socket != null) return if (socket != null) {
connectingBlock.set(false)
return
}
lastConnectTentative = TimeUtils.now() lastConnectTentative = TimeUtils.now()
try {
val request = val request =
Request.Builder() Request.Builder()
.header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}") .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")