Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fenix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
The Tor Project
Applications
fenix
Commits
22b7ca55
Commit
22b7ca55
authored
Sep 18, 2020
by
Matthew Finkel
Browse files
Options
Downloads
Patches
Plain Diff
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
!26
Bug 40041 09
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/src/main/java/org/mozilla/fenix/tor/TorController.kt
+35
-0
35 additions, 0 deletions
app/src/main/java/org/mozilla/fenix/tor/TorController.kt
with
35 additions
and
0 deletions
app/src/main/java/org/mozilla/fenix/tor/TorController.kt
+
35
−
0
View file @
22b7ca55
...
...
@@ -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
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment