From 031186e74c9f174d05a09c4059def7bcbc558ac6 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 27 Apr 2012 23:24:49 +0200
Subject: it is not getIntent() nor savedState nor other fancy stuff,
 getArgument() is what I want

---
 res/layout/basic_settings.xml        | 16 +++++++++++++++-
 res/layout/viewconfig.xml            | 11 +++++++++++
 res/layout/vpn_preference_layout.xml |  2 +-
 res/values/strings.xml               |  1 +
 res/xml/vpn_authentification.xml     | 12 ++++++++++--
 res/xml/vpn_headers.xml              | 22 +++++++++-------------
 res/xml/vpn_ipsettings.xml           |  6 +++++-
 7 files changed, 52 insertions(+), 18 deletions(-)
 create mode 100644 res/layout/viewconfig.xml

(limited to 'res')

diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml
index cfe8c6e3..4e6f549f 100644
--- a/res/layout/basic_settings.xml
+++ b/res/layout/basic_settings.xml
@@ -25,6 +25,20 @@
         android:orientation="vertical"
         android:padding="3mm" >
 
+        <TextView
+            style="@style/item"
+            android:text="@string/profilename"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <EditText
+            android:id="@+id/profilename"
+            style="@style/item"
+            android:inputType="text"
+            />
+
+        
+        
+
         <TextView
             style="@style/item"
             android:text="@string/address"
@@ -38,7 +52,7 @@
 
             <!-- <requestFocus /> -->
         </EditText>
-
+        
         <TextView
             style="@style/item"
             android:text="@string/port"
diff --git a/res/layout/viewconfig.xml b/res/layout/viewconfig.xml
new file mode 100644
index 00000000..5ae34ef0
--- /dev/null
+++ b/res/layout/viewconfig.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <TextView
+        android:id="@+id/configview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/vpn_preference_layout.xml b/res/layout/vpn_preference_layout.xml
index 15fc91ab..fbb18115 100644
--- a/res/layout/vpn_preference_layout.xml
+++ b/res/layout/vpn_preference_layout.xml
@@ -22,7 +22,7 @@
     android:minHeight="?android:attr/listPreferredItemHeight" >
 
     <LinearLayout
-        android:id="@+id/inputmethod_pref"
+        android:id="@+id/vpnconfig_pref"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_weight="1"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 79b7f8a7..ee2a4113 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -96,6 +96,7 @@
     <string name="menu_add_profile">Add Profile</string>
     <string name="add_profile_name_prompt">Enter a name identifying the new Profile</string>
     <string name="duplicate_profile_name">Duplicate Profile Name</string>
+    <string name="profilename">Profile Name</string>
     
     
 </resources>
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" >
-- 
cgit v1.2.3