summaryrefslogtreecommitdiff
path: root/res/xml
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-04-27 23:24:49 +0200
committerArne Schwabe <arne@rfc2549.org>2012-04-27 23:24:49 +0200
commit031186e74c9f174d05a09c4059def7bcbc558ac6 (patch)
tree8506351e5a3e9904c70c881b1d13b2a1d1030383 /res/xml
parent817812066576fb1e2fd627927ad5cfc7bf7c79d5 (diff)
it is not getIntent() nor savedState nor other fancy stuff, getArgument() is what I want
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/vpn_authentification.xml12
-rw-r--r--res/xml/vpn_headers.xml22
-rw-r--r--res/xml/vpn_ipsettings.xml6
3 files changed, 24 insertions, 16 deletions
diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml
index 949093d6..3781211f 100644
--- a/res/xml/vpn_authentification.xml
+++ b/res/xml/vpn_authentification.xml
@@ -5,7 +5,15 @@
android:key="remoteServerTLS"
android:summary="Checks whether the server uses a TLS Server Certificate"
android:title="Except TLS Server" />
+ <CheckBoxPreference
+ android:key="checkRemoteCN"
+ android:summary="Checks the Remote Server Certificate CN against a String"
+ android:title="Certificate Hostname Check" />
+
+ <EditTextPreference
+ android:dependency="checkRemoteCN"
+ android:dialogMessage="Enter the String against which the remote Server is checked. Openvpn will use prefix matching. &quot;Server&quot; matches &quot;Server-1&quot; and &quot;Server-2&quot;"
+ android:title="Remote Hostname(CN)"
+ android:key="remotecn"/>
-
- <CheckBoxPreference android:key="useTLSAuth"/>
</PreferenceScreen> \ No newline at end of file
diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index 424b4411..faaa6cdd 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -2,34 +2,30 @@
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android" >
<header
+ android:tag="BasicSettings"
android:fragment="de.blinkt.openvpn.BasicSettings"
android:summary="Server, port and authentication method. Normally you should only settings specified here."
- android:title="Basic Settings" />
+ android:title="Basic Settings"
+ android:id="@+id/basicsettingsid"/>
<!-- android:icon="@drawable/ic_settings_applications" -->
<header
- android:fragment="de.blinkt.openvpn.VPNPreferences$IP_Settings"
+ android:fragment="de.blinkt.openvpn.Settings_IP"
android:summary="IP Address and Routing"
android:title="IP Settings" />
<header
- android:fragment="de.blinkt.openvpn.VPNPreferences$Authentication"
+ android:fragment="de.blinkt.openvpn.Settings_Authentication"
android:summary="Authentication"
android:title="Authentication" />
<!-- android:icon="@drawable/ic_settings_display" -->
- <header
- android:fragment="de.blinkt.openvpn.VPNPreferences$Obscure"
+ <!--
+ <header
+ android:fragment="de.blinkt.openvpn.Settings_Obscure"
android:summary="Obscure OpenVPN Settings. Normaly not needed."
android:title="Obscure" >
-
- <!--
- Arbitrary key/value pairs can be included with a header as
- arguments to its fragment.
- -->
- <extra
- android:name="someKey"
- android:value="someHeaderValue" />
</header>
+ -->
<header
android:fragment="de.blinkt.openvpn.ShowConfigFragment"
android:summary="Shows the generated openvpn Configuration File"
diff --git a/res/xml/vpn_ipsettings.xml b/res/xml/vpn_ipsettings.xml
index 8aacaaca..79356e69 100644
--- a/res/xml/vpn_ipsettings.xml
+++ b/res/xml/vpn_ipsettings.xml
@@ -4,7 +4,9 @@
<SwitchPreference
android:disableDependentsState="true"
android:key="usePull"
- android:title="Pull Settings" />
+ android:title="Pull Settings"
+ android:summaryOn="Requests IP addresses, routes and timing options from the server."
+ android:summaryOff="No information is requested from the server. Settings need to be specified below." />
<PreferenceCategory android:title="IP" >
<EditTextPreference
@@ -29,9 +31,11 @@
android:title="searchDomain" />
<EditTextPreference
android:key="dns1"
+ android:dialogMessage="DNS Server to be used."
android:title="DNS Server" />
<EditTextPreference
android:key="dns2"
+ android:dialogMessage="Secondary DNS Server used if the normal DNS Server cannot be reached."
android:title="Backup DNS Server" />
</PreferenceCategory>
<PreferenceCategory android:title="Routing" >