highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-09 21:22:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Making sure the order of params is right

Browse Source
This commit is contained in:
Vitor Pamplona
2025-07-02 13:35:01 -04:00
parent ce7965d00e
commit dd5c2ca704
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelaySettings.kt
View File

@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.model.torState
import com.vitorpamplona.amethyst.ui.tor.TorType
class TorRelaySettings(
data class TorRelaySettings(
val torType: TorType = TorType.OFF,
val onionRelaysViaTor: Boolean = true,
val dmRelaysViaTor: Boolean = false,

48
amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelayState.kt
View File

@@ -54,15 +54,21 @@ class TorRelayState(
trustedRelaysViaTor: Boolean,
newRelaysViaTor: Boolean,
->
TorRelaySettings(torType, onionRelaysViaTor, dmRelaysViaTor, trustedRelaysViaTor, newRelaysViaTor)
TorRelaySettings(
torType = torType,
onionRelaysViaTor = onionRelaysViaTor,
dmRelaysViaTor = dmRelaysViaTor,
trustedRelaysViaTor = trustedRelaysViaTor,
newRelaysViaTor = newRelaysViaTor,
)
}.onStart {
emit(
TorRelaySettings(
settings.torSettings.torType.value,
settings.torSettings.onionRelaysViaTor.value,
settings.torSettings.dmRelaysViaTor.value,
settings.torSettings.trustedRelaysViaTor.value,
settings.torSettings.newRelaysViaTor.value,
torType = settings.torSettings.torType.value,
onionRelaysViaTor = settings.torSettings.onionRelaysViaTor.value,
dmRelaysViaTor = settings.torSettings.dmRelaysViaTor.value,
trustedRelaysViaTor = settings.torSettings.trustedRelaysViaTor.value,
newRelaysViaTor = settings.torSettings.newRelaysViaTor.value,
),
)
}.flowOn(Dispatchers.Default)
@@ -70,11 +76,11 @@ class TorRelayState(
scope,
SharingStarted.Eagerly,
TorRelaySettings(
settings.torSettings.torType.value,
settings.torSettings.onionRelaysViaTor.value,
settings.torSettings.dmRelaysViaTor.value,
settings.torSettings.trustedRelaysViaTor.value,
settings.torSettings.newRelaysViaTor.value,
torType = settings.torSettings.torType.value,
onionRelaysViaTor = settings.torSettings.onionRelaysViaTor.value,
dmRelaysViaTor = settings.torSettings.dmRelaysViaTor.value,
trustedRelaysViaTor = settings.torSettings.trustedRelaysViaTor.value,
newRelaysViaTor = settings.torSettings.newRelaysViaTor.value,
),
)
@@ -84,13 +90,19 @@ class TorRelayState(
trustedRelayState.flow,
dmRelayState.flow,
) { torSettings: TorRelaySettings, trustedRelayList: Set<NormalizedRelayUrl>, dmRelayList: Set<NormalizedRelayUrl> ->
emit(TorRelayEvaluation(torSettings, trustedRelayList, dmRelayList))
emit(
TorRelayEvaluation(
torSettings = torSettings,
trustedRelayList = trustedRelayList,
dmRelayList = dmRelayList,
),
)
}.onStart {
emit(
TorRelayEvaluation(
torSettings.value,
trustedRelayState.flow.value,
dmRelayState.flow.value,
torSettings = torSettings.value,
trustedRelayList = trustedRelayState.flow.value,
dmRelayList = dmRelayState.flow.value,
),
)
}.flowOn(Dispatchers.Default)
@@ -98,9 +110,9 @@ class TorRelayState(
scope,
SharingStarted.Eagerly,
TorRelayEvaluation(
torSettings.value,
trustedRelayState.flow.value,
dmRelayState.flow.value,
torSettings = torSettings.value,
trustedRelayList = trustedRelayState.flow.value,
dmRelayList = dmRelayState.flow.value,
),
)
}