Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Refactor Tor settings and add a setting for forcing to use bridges

Browse Source
This commit is contained in:
Torsten Grote
2018-08-13 17:57:44 -03:00
parent e5112ae9ee
commit 9b17836595
7 changed files with 121 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/main/res/values/arrays.xml
View File

@@ -8,16 +8,20 @@
<item>@string/bluetooth_setting_enabled</item>
<item>@string/bluetooth_setting_disabled</item>
</string-array>
<string-array name="tor_network_setting_names">
<item>@string/tor_network_setting_automatic</item>
<item>@string/tor_network_setting_without_bridges</item>
<item>@string/tor_network_setting_with_bridges</item>
<item>@string/tor_network_setting_never</item>
<item>@string/tor_network_setting_wifi</item>
<item>@string/tor_network_setting_always</item>
</string-array>
<string-array name="tor_network_setting_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
<string-array name="pref_language_values">
<item>default</item>
<item>en-US</item>

16
briar-android/src/main/res/values/strings.xml
View File

@@ -348,12 +348,16 @@
<string name="bluetooth_setting">Connect via Bluetooth</string>
<string name="bluetooth_setting_enabled">Whenever contacts are nearby</string>
<string name="bluetooth_setting_disabled">Only when adding contacts</string>
<string name="tor_network_setting">Connect via Tor</string>
<string name="tor_network_setting_never">Never</string>
<string name="tor_network_setting_wifi">Only when using Wi-Fi</string>
<string name="tor_network_setting_always">When using Wi-Fi or mobile data</string>
<string name="tor_location_setting_title">Disable Tor based on location</string>
<string name="tor_location_setting_hint_format">Disable Tor in countries where it is likely to be blocked (%1$s)</string>
<string name="tor_network_setting">Connect via Internet (Tor)</string>
<string name="tor_network_setting_automatic">Automatic based on location</string>
<string name="tor_network_setting_without_bridges">Use Tor without bridges</string>
<string name="tor_network_setting_with_bridges">Use Tor with bridges</string>
<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>
<!-- Settings Security and Panic -->
<string name="security_settings_title">Security</string>

6
briar-android/src/main/res/xml/settings.xml
View File

@@ -36,7 +36,7 @@
android:title="@string/bluetooth_setting"/>
<ListPreference
android:defaultValue="2"
android:defaultValue="0"
android:entries="@array/tor_network_setting_names"
android:entryValues="@array/tor_network_setting_values"
android:key="pref_key_tor_network"
@@ -46,9 +46,9 @@
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_tor_location"
android:key="pref_key_tor_mobile_data"
android:persistent="false"
android:title="@string/tor_location_setting_title"/>
android:title="@string/tor_mobile_data_title"/>
</PreferenceCategory>