Speeds up first time logins by not waiting for Tor
This commit is contained in:
@@ -117,10 +117,11 @@ class Amethyst : Application() {
|
|||||||
// Connects the NostrClient class with okHttp
|
// Connects the NostrClient class with okHttp
|
||||||
val websocketBuilder =
|
val websocketBuilder =
|
||||||
OkHttpWebSocket.Builder { url ->
|
OkHttpWebSocket.Builder { url ->
|
||||||
|
val useTor = torProxySettingsAnchor.useProxy(url)
|
||||||
if (torProxySettingsAnchor.isDM(url)) {
|
if (torProxySettingsAnchor.isDM(url)) {
|
||||||
okHttpClientForRelaysForDms.getHttpClient(torProxySettingsAnchor.useProxy(url))
|
okHttpClientForRelaysForDms.getHttpClient(useTor)
|
||||||
} else {
|
} else {
|
||||||
okHttpClientForRelays.getHttpClient(torProxySettingsAnchor.useProxy(url))
|
okHttpClientForRelays.getHttpClient(useTor)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class TorSettings(
|
|||||||
val externalSocksPort: Int = 9050,
|
val externalSocksPort: Int = 9050,
|
||||||
val onionRelaysViaTor: Boolean = true,
|
val onionRelaysViaTor: Boolean = true,
|
||||||
val dmRelaysViaTor: Boolean = true,
|
val dmRelaysViaTor: Boolean = true,
|
||||||
val newRelaysViaTor: Boolean = true,
|
val newRelaysViaTor: Boolean = false,
|
||||||
val trustedRelaysViaTor: Boolean = false,
|
val trustedRelaysViaTor: Boolean = false,
|
||||||
val urlPreviewsViaTor: Boolean = false,
|
val urlPreviewsViaTor: Boolean = false,
|
||||||
val profilePicsViaTor: Boolean = false,
|
val profilePicsViaTor: Boolean = false,
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class TorSettingsFlow(
|
|||||||
val externalSocksPort: MutableStateFlow<Int> = MutableStateFlow(9050),
|
val externalSocksPort: MutableStateFlow<Int> = MutableStateFlow(9050),
|
||||||
val onionRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
|
val onionRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
|
||||||
val dmRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
|
val dmRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
|
||||||
val newRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
|
val newRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
|
||||||
val trustedRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
|
val trustedRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
|
||||||
val urlPreviewsViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
|
val urlPreviewsViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
|
||||||
val profilePicsViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
|
val profilePicsViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
|
||||||
|
|||||||
Reference in New Issue
Block a user