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

Merge branch '37_optionally_disable_tor' into 'master'

Browse Source 
37 optionally disable tor

Provides:

* Checkbox in the settings view to disable Tor if not connected to a wifi network
* A network change callback in the Tor plugin to identify wifi connect/disconnect events
* A settings change event handler to disable enable tor when the user enables or disables the setting



See merge request !11
This commit is contained in:
akwizgran
2015-12-15 17:12:39 +00:00
parent bab9a41981 403ab75d13
commit d710841728
5 changed files with 155 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/res/values/strings.xml
View File

@@ -102,6 +102,8 @@
<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_wifi_setting_title">TOR</string>
<string name="tor_wifi_setting"> Use Tor over WiFi Only</string>
<string name="notification_settings_title">NOTIFICATIONS</string>
<string name="notify_private_messages_setting">Show alerts for private messages</string>
<string name="notify_group_posts_setting">Show alerts for forum posts</string>