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

Makes the torControl option nullable to allow an Orbot-based Active flow

Browse Source
This commit is contained in:
Vitor Pamplona
2025-09-11 11:02:25 -04:00
parent 1af5daffcf
commit abd6e6f2ac
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/RelayProxyClientConnector.kt
View File

@@ -77,7 +77,7 @@ class RelayProxyClientConnector(
} }
val torStatus = torManager.status.value val torStatus = torManager.status.value
if (torStatus is TorServiceStatus.Active) { if (torStatus is TorServiceStatus.Active) {
torStatus.torControlConnection.signal(TorControlCommands.SIGNAL_DORMANT) torStatus.torControlConnection?.signal(TorControlCommands.SIGNAL_DORMANT)
Log.d("ManageRelayServices", "Pausing Tor Activity") Log.d("ManageRelayServices", "Pausing Tor Activity")
} }
} else if (it.connectivity is ConnectivityStatus.Active && !client.isActive()) { } else if (it.connectivity is ConnectivityStatus.Active && !client.isActive()) {
@@ -85,8 +85,8 @@ class RelayProxyClientConnector(
val torStatus = torManager.status.value val torStatus = torManager.status.value
if (torStatus is TorServiceStatus.Active) { if (torStatus is TorServiceStatus.Active) {
torStatus.torControlConnection.signal(TorControlCommands.SIGNAL_ACTIVE) torStatus.torControlConnection?.signal(TorControlCommands.SIGNAL_ACTIVE)
torStatus.torControlConnection.signal(TorControlCommands.SIGNAL_NEWNYM) torStatus.torControlConnection?.signal(TorControlCommands.SIGNAL_NEWNYM)
Log.d("ManageRelayServices", "Resuming Tor Activity with new nym") Log.d("ManageRelayServices", "Resuming Tor Activity with new nym")
} }

3
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorServiceStatus.kt
View File

@@ -26,7 +26,8 @@ sealed class TorServiceStatus {
data class Active( data class Active(
val port: Int, val port: Int,
) : TorServiceStatus() { ) : TorServiceStatus() {
lateinit var torControlConnection: TorControlConnection // If internal, it has control.
var torControlConnection: TorControlConnection? = null
} }
object Off : TorServiceStatus() object Off : TorServiceStatus()