Skip to main content
Homepage
Explore
Search or go to…
/
Sign in
Explore
Primary navigation
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
?
Collapse sidebar
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Applications
fenix
Commits
50a2e757
This project is archived. Its data is
read-only
.
Commit
50a2e757
authored
Sep 28, 2020
by
Matthew Finkel
Browse files
Options
Downloads
Patches
Plain Diff
fixup! Bug 40028: Implement Tor connect and logger screens
parent
ab897368
Branches
Branches containing commit
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/home/sessioncontrol/viewholders/TorBootstrapConnectViewHolder.kt
+2
-20
2 additions, 20 deletions
...ssioncontrol/viewholders/TorBootstrapConnectViewHolder.kt
with
2 additions
and
20 deletions
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapConnectViewHolder.kt
+
2
−
20
View file @
50a2e757
...
...
@@ -83,6 +83,7 @@ class TorBootstrapConnectViewHolder(
}
}
@SuppressWarnings
(
"EmptyFunctionBlock"
)
override
fun
onTorConnecting
()
{
}
...
...
@@ -90,32 +91,13 @@ class TorBootstrapConnectViewHolder(
components
.
torController
.
unregisterTorListener
(
this
);
}
@SuppressWarnings
(
"EmptyFunctionBlock"
)
override
fun
onTorStopped
()
{
}
override
fun
onTorStatusUpdate
(
entry
:
String
?,
status
:
String
?)
{
if
(
entry
==
null
)
return
if
(
status
!=
null
&&
status
.
startsWith
(
"STOPPING"
))
{
if
(
entry
.
contains
(
"Unable to start Tor"
))
{
// Only restart Tor with Debug logging once
if
(
components
.
torController
.
isDebugLoggingEnabled
)
{
with
(
view
.
tor_bootstrap_connect_button
)
{
text
=
context
.
resources
.
getString
(
R
.
string
.
tor_bootstrap_connecting_failed
)
isEnabled
=
false
}
return
}
interactor
.
onTorStartDebugBootstrapping
()
}
else
{
// We assume TorService is "stopping" as the result of the user cancelling bootstrap,
// such as by selecting the Tor Network Settings button
with
(
view
.
tor_bootstrap_connect_button
)
{
text
=
context
.
resources
.
getString
(
R
.
string
.
tor_bootstrap_connect
)
}
}
}
view
.
tor_bootstrap_status_message
.
text
=
entry
if
(
entry
.
startsWith
(
BOOTSTRAPPED_PREFIX
))
{
val
percentIdx
=
entry
.
indexOf
(
"%"
)
...
...
...
...
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