nostr/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2024-09-29 16:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #753 from greenart7c3/proxy_fix

Browse Source 
Recreate http client when changing the proxy or timeout
This commit is contained in:
Vitor Pamplona 2024-01-27 11:39:29 -05:00 committed by GitHub
commit 504e55a93f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt
View File

@ -51,6 +51,8 @@ object HttpClient {
fun start(proxy: Proxy?) { fun start(proxy: Proxy?) {
if (internalProxy != proxy) { if (internalProxy != proxy) {
Log.d("HttpClient", "Changing proxy to: ${proxy != null}")
this.defaultHttpClient = null
this.internalProxy = proxy this.internalProxy = proxy
this.defaultHttpClient = getHttpClient() this.defaultHttpClient = getHttpClient()
} }
@ -59,6 +61,7 @@ object HttpClient {
fun changeTimeouts(timeout: Duration) { fun changeTimeouts(timeout: Duration) {
Log.d("HttpClient", "Changing timeout to: $timeout") Log.d("HttpClient", "Changing timeout to: $timeout")
if (this.defaultTimeout.seconds != timeout.seconds) { if (this.defaultTimeout.seconds != timeout.seconds) {
this.defaultHttpClient = null
this.defaultTimeout = timeout this.defaultTimeout = timeout
this.defaultHttpClient = getHttpClient() this.defaultHttpClient = getHttpClient()
} }

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

@ -106,7 +106,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") Log.d("Relay", "Relay.connect $url 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