Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Julian Dehm
briar
Commits
4b9a9771
Verified
Commit
4b9a9771
authored
Aug 16, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tor settings: Address review comments
parent
9b178365
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
...n/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
+1
-1
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
...briarproject/briar/android/settings/SettingsFragment.java
+1
-1
briar-android/src/main/res/values/strings.xml
briar-android/src/main/res/values/strings.xml
+1
-3
No files found.
bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
View file @
4b9a9771
...
...
@@ -649,7 +649,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
enableNetwork
(
false
);
}
else
if
(
network
==
PREF_TOR_NETWORK_NEVER
||
(!
useMobile
&&
!
wifi
))
{
LOG
.
info
(
"Disabling network due to
data
setting"
);
LOG
.
info
(
"Disabling network due to setting"
);
enableNetwork
(
false
);
}
else
if
(
automatic
&&
blocked
&&
!
bridgesWork
)
{
LOG
.
info
(
"Disabling network, country is blocked"
);
...
...
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View file @
4b9a9771
...
...
@@ -314,7 +314,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
// Look up country name in the user's chosen language if available
String
country
=
locationUtils
.
getCurrentCountry
();
String
countryName
=
getString
(
R
.
string
.
tor_network_country_unknown
)
;
String
countryName
=
country
;
for
(
Locale
locale
:
Locale
.
getAvailableLocales
())
{
if
(
locale
.
getCountry
().
equalsIgnoreCase
(
country
))
{
countryName
=
locale
.
getDisplayCountry
();
...
...
briar-android/src/main/res/values/strings.xml
View file @
4b9a9771
...
...
@@ -355,9 +355,7 @@
<string
name=
"tor_network_setting_never"
>
Don\'t connect
</string>
<!-- How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus) -->
<string
name=
"tor_network_setting_summary"
>
Automatic: %1$s (in %2$s)
</string>
<!-- The placeholder when we don't know the user's current country -->
<string
name=
"tor_network_country_unknown"
>
unknown
</string>
<string
name=
"tor_mobile_data_title"
>
Use Mobile Data
</string>
<string
name=
"tor_mobile_data_title"
>
Use mobile data
</string>
<!-- Settings Security and Panic -->
<string
name=
"security_settings_title"
>
Security
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment