Skip to content
Snippets Groups Projects
Commit 22b7ca55 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

fixup! Bug 40028: Implement Tor Service controller

Add access/mutator for bridge information.
parent 1ad711c6
No related branches found
No related tags found
1 merge request!26Bug 40041 09
......@@ -22,6 +22,7 @@ import org.torproject.android.service.OrbotConstants
import org.torproject.android.service.TorService
import org.torproject.android.service.TorServiceConstants
import org.torproject.android.service.util.TorServiceUtils
import org.torproject.android.service.util.Prefs
interface TorEvents {
fun onTorConnecting()
......@@ -86,6 +87,40 @@ class TorController(
val isBootstrapped get() = isTorBootstrapped
val isConnected get() = (lastKnownStatus.isStarted() && !isTorRestarting)
var bridgesEnabled: Boolean
get() = Prefs.bridgesEnabled()
set(value) { Prefs.putBridgesEnabled(value) }
var bridgeTransport: TorBridgeTransportConfig
get() {
return TorBridgeTransportConfigUtil.getStringToBridgeTransport(
Prefs.getBridgesList()
)
}
set(value) {
if (value == TorBridgeTransportConfig.USER_PROVIDED) {
// Don't set the pref when the value is USER_PROVIDED because
// "user_provided" is not a valid bridge or transport type.
// This call should be followed by setting userProvidedBridges.
return
}
Prefs.setBridgesList(value.transportName)
}
var userProvidedBridges: String?
get() {
val bridges = Prefs.getBridgesList()
val bridgeType =
TorBridgeTransportConfigUtil.getStringToBridgeTransport(bridges)
return when (bridgeType) {
TorBridgeTransportConfig.USER_PROVIDED -> bridges
else -> null
}
}
set(value) {
Prefs.setBridgesList(value)
}
fun start() {
// Register receiver
lbm.registerReceiver(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment