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

Merge branch '1269-bridge-setting' into 'master'

Browse Source 
Refactor Tor settings and add a setting for forcing the use bridges

Closes #1269

See merge request briar/briar!895
This commit is contained in:
akwizgran
2018-08-20 17:56:56 +00:00
parent e51c437a06 4b9a9771f8
commit 169c59349e
7 changed files with 120 additions and 87 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>