Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +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

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>