diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-03-11 16:04:47 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-03-11 16:04:47 +0100 |
| commit | 9fed5954c68119d05be09951f209c452a45a00c3 (patch) | |
| tree | 8737a6d0b5177ed8ef451122a9af236e3f41b6dd /main/src/main/res/xml/general_settings.xml | |
| parent | a52f8dcdaa9274a65b93699a65849e355b8b3df6 (diff) | |
| parent | 76355e501a513a66329b062cf3bebd9eff81c0ba (diff) | |
Resurrect code for OpenVPN C++ core
--HG--
rename : jni/Android.mk => main/jni/Android.mk
rename : jni/Application.mk => main/jni/Application.mk
rename : ovpn3/Android.mk => main/ovpn3/Android.mk
rename : ovpn3/boostsrc/error_code.cpp => main/ovpn3/boostsrc/error_code.cpp
rename : src/de/blinkt/openvpn/VpnProfile.java => main/src/main/java/de/blinkt/openvpn/VpnProfile.java
rename : src/de/blinkt/openvpn/OpenVpnManagementThread.java => main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
rename : src/de/blinkt/openvpn/OpenVpnService.java => main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
rename : src/de/blinkt/openvpn/LogWindow.java => main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
Diffstat (limited to 'main/src/main/res/xml/general_settings.xml')
| -rw-r--r-- | main/src/main/res/xml/general_settings.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/main/src/main/res/xml/general_settings.xml b/main/src/main/res/xml/general_settings.xml index d43ab6a3..4eca5243 100644 --- a/main/src/main/res/xml/general_settings.xml +++ b/main/src/main/res/xml/general_settings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <PreferenceCategory android:title="@string/appbehaviour"> + <PreferenceCategory android:title="@string/appbehaviour" android:key="app_behaviour"> <CheckBoxPreference android:defaultValue="true" android:key="showlogwindow" @@ -8,6 +8,14 @@ android:title="@string/show_log_window"/> <CheckBoxPreference + android:defaultValue="false" + android:key="ovpn3" + android:summaryOn="Use the C++ OpenVPN library" + android:summaryOff="Use OpenVPN 2.3" + android:title="OpenVPN 3 Core"/> + + + <CheckBoxPreference android:defaultValue="false" android:key="restartvpnonboot" android:summary="@string/onbootrestartsummary" |