From f743921f5812cd7f6c6b681382d60508ed02a4a9 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 18 May 2012 00:06:49 +0200
Subject: - Make Ipv6 support complete (minus tun-ipv6 warning) - Implement
 byte counter support in the log window - Fix spelling of secret (closes issue
 #22) - Replace &quot;quot; with &quot;, no idea what went wrong there (closes
 issue #21)

---
 res/xml/vpn_headers.xml    | 14 ++++++++------
 res/xml/vpn_ipsettings.xml | 41 +++++++++++------------------------------
 res/xml/vpn_routing.xml    | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 36 deletions(-)
 create mode 100644 res/xml/vpn_routing.xml

(limited to 'res/xml')

diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index c299d2a5..3762d445 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -2,27 +2,29 @@
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <header
-        android:tag="BasicSettings"
+        android:id="@+id/basicsettingsid"
         android:fragment="de.blinkt.openvpn.Settings_Basic"
-        android:title="Basic Settings" 
-        android:id="@+id/basicsettingsid"/>
+        android:tag="BasicSettings"
+        android:title="Basic Settings" />
     <!-- android:icon="@drawable/ic_settings_applications" -->
 
     <header
         android:fragment="de.blinkt.openvpn.Settings_IP"
-        android:summary="IP Address and Routing"
+        android:summary="IP Address"
         android:title="IP Settings" />
+    <header
+        android:fragment="de.blinkt.openvpn.Settings_Routing"
+        android:title="Routing" />
     <header
         android:fragment="de.blinkt.openvpn.Settings_Authentication"
         android:title="@string/settings_auth" />
 
     <!-- android:icon="@drawable/ic_settings_display" -->
-     <header
+    <header
         android:fragment="de.blinkt.openvpn.Settings_Obscure"
         android:summary="Obscure OpenVPN Settings. Normally not needed."
         android:title="Obscure" >
     </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 fe55e8b4..e482f8f1 100644
--- a/res/xml/vpn_ipsettings.xml
+++ b/res/xml/vpn_ipsettings.xml
@@ -4,9 +4,9 @@
     <SwitchPreference
         android:disableDependentsState="true"
         android:key="usePull"
-        android:title="@string/use_pull" 
+        android:summaryOff="@string/pull_off_summary"
         android:summaryOn="@string/pull_on_summary"
-    	android:summaryOff="@string/pull_off_summary" />
+        android:title="@string/use_pull" />
 
     <PreferenceCategory android:title="IP" >
         <EditTextPreference
@@ -17,15 +17,15 @@
         <EditTextPreference
             android:dependency="usePull"
             android:dialogMessage="@string/ipv6_dialog_tile"
+            android:enabled="false"
             android:key="ipv6_address"
-            android:title="@string/ipv6_address" 
-            android:enabled="false"/>
-        <CheckBoxPreference 
-            android:title="@string/no_bind"
-            android:summary="@string/nobind_summary"
-            android:persistent="false"
-            android:key="nobind" />
+            android:title="@string/ipv6_address" />
 
+        <CheckBoxPreference
+            android:key="nobind"
+            android:persistent="false"
+            android:summary="@string/nobind_summary"
+            android:title="@string/no_bind" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/dns" >
         <CheckBoxPreference
@@ -37,32 +37,13 @@
             android:key="searchdomain"
             android:title="@string/searchdomain" />
         <EditTextPreference
-            android:key="dns1"
             android:dialogMessage="@string/dns1_summary"
+            android:key="dns1"
             android:title="@string/dns_server" />
         <EditTextPreference
-            android:key="dns2"
             android:dialogMessage="@string/secondary_dns_message"
+            android:key="dns2"
             android:title="@string/backup_dns" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="Routing" >
-        <CheckBoxPreference
-			android:title="@string/ignored_pushed_routes"
-			android:key="routenopull"
-			android:summary="@string/ignore_routes_summary"
-
-            />
-        <CheckBoxPreference
-            android:disableDependentsState="true"
-            android:key="useDefaultRoute"
-            android:summary="@string/default_route_summary"
-            android:title="@string/use_default_title" />
-
-        <EditTextPreference
-            android:dependency="useDefaultRoute"
-            android:dialogMessage="@string/custom_route_message"
-            android:key="customRoutes"
-            android:title="@string/custom_routes_title" />
-    </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/vpn_routing.xml b/res/xml/vpn_routing.xml
new file mode 100644
index 00000000..ce19a500
--- /dev/null
+++ b/res/xml/vpn_routing.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <CheckBoxPreference
+        android:key="routenopull"
+        android:summary="@string/ignore_routes_summary"
+        android:title="@string/ignored_pushed_routes" />
+
+    <PreferenceCategory android:title="@string/ipv4" >
+        <CheckBoxPreference
+            android:disableDependentsState="true"
+            android:key="useDefaultRoute"
+            android:summary="@string/default_route_summary"
+            android:title="@string/use_default_title" />
+
+        <EditTextPreference
+            android:dependency="useDefaultRoute"
+            android:dialogMessage="@string/custom_route_message"
+            android:key="customRoutes"
+            android:title="@string/custom_routes_title" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/ipv6" >
+        <CheckBoxPreference
+            android:disableDependentsState="true"
+            android:key="useDefaultRoutev6"
+            android:summary="@string/default_route_summary"
+            android:title="@string/use_default_title" />
+
+        <EditTextPreference
+            android:dependency="useDefaultRoutev6"
+            android:dialogMessage="@string/custom_route_message"
+            android:key="customRoutesv6"
+            android:title="@string/custom_routes_title" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3