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

Added a setting to disable Tor.

Browse Source 
Also fixed a bug with settings namespaces.
This commit is contained in:
akwizgran
2017-03-07 10:31:50 +00:00
parent a9053808b4
commit e682f31898
12 changed files with 137 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,14 @@
<item>@string/bluetooth_setting_enabled</item>
<item>@string/bluetooth_setting_disabled</item>
</string-array>
<string-array name="tor_mobile_setting_names">
<item>@string/tor_mobile_setting_enabled</item>
<item>@string/tor_mobile_setting_disabled</item>
<string-array name="tor_network_setting_names">
<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>
</string-array>
</resources>

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

@@ -310,9 +310,10 @@
<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_mobile_setting">Connect via Tor</string>
<string name="tor_mobile_setting_enabled">When using Wi-Fi or mobile data</string>
<string name="tor_mobile_setting_disabled">Only when using Wi-Fi</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>
<!-- Settings Security and Panic -->
<string name="security_settings_title">Security</string>

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

@@ -15,13 +15,13 @@
android:title="@string/bluetooth_setting"/>
<ListPreference
android:defaultValue="true"
android:entries="@array/tor_mobile_setting_names"
android:entryValues="@array/boolean_array"
android:key="pref_key_tor_mobile"
android:defaultValue="2"
android:entries="@array/tor_network_setting_names"
android:entryValues="@array/tor_network_setting_values"
android:key="pref_key_tor_network"
android:persistent="false"
android:summary="%s"
android:title="@string/tor_mobile_setting"/>
android:title="@string/tor_network_setting"/>
</PreferenceCategory>