highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-20 18:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes access to Citrine

Browse Source
This commit is contained in:
Vitor Pamplona
2024-09-27 14:38:14 -04:00
parent 3aa316d262
commit 86e5dfa799
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
View File

@@ -413,14 +413,15 @@ class Account(
combineTransform( combineTransform(
connectToRelays, connectToRelays,
settings.torSettings.torType, settings.torSettings.torType,
settings.torSettings.onionRelaysViaTor,
settings.torSettings.trustedRelaysViaTor, settings.torSettings.trustedRelaysViaTor,
) { relays, torType, forceTor -> ) { relays, torType, useTorForOnionRelays, useTorForTrustedRelays ->
emit( emit(
relays relays
.map { .map {
RelaySetupInfoToConnect( RelaySetupInfoToConnect(
it.url, it.url,
torType != TorType.OFF && forceTor, torType != TorType.OFF && checkLocalHostOnionAndThen(it.url, useTorForOnionRelays, useTorForTrustedRelays),
it.read, it.read,
it.write, it.write,
it.feedTypes, it.feedTypes,
@@ -440,7 +441,12 @@ class Account(
).map { ).map {
RelaySetupInfoToConnect( RelaySetupInfoToConnect(
it.url, it.url,
settings.torSettings.torType.value != TorType.OFF && settings.torSettings.trustedRelaysViaTor.value, settings.torSettings.torType.value != TorType.OFF &&
checkLocalHostOnionAndThen(
it.url,
settings.torSettings.onionRelaysViaTor.value,
settings.torSettings.trustedRelaysViaTor.value,
),
it.read, it.read,
it.write, it.write,
it.feedTypes, it.feedTypes,
@@ -3423,11 +3429,17 @@ class Account(
private fun checkLocalHostOnionAndThen( private fun checkLocalHostOnionAndThen(
normalizedUrl: String, normalizedUrl: String,
final: Boolean, final: Boolean,
): Boolean = checkLocalHostOnionAndThen(normalizedUrl, settings.torSettings.onionRelaysViaTor.value, final)
private fun checkLocalHostOnionAndThen(
normalizedUrl: String,
isOnionRelaysActive: Boolean,
final: Boolean,
): Boolean = ): Boolean =
if (isLocalHost(normalizedUrl)) { if (isLocalHost(normalizedUrl)) {
false false
} else if (isOnionUrl(normalizedUrl)) { } else if (isOnionUrl(normalizedUrl)) {
settings.torSettings.onionRelaysViaTor.value isOnionRelaysActive
} else { } else {
final final
} }