- 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; with ", no idea what went wrong there (closes issue #21)

5 files changed, 79 insertions, 39 deletions

diff --git a/res/layout/logwindow.xml b/res/layout/logwindow.xml
new file mode 100644
index 00000000..4051c92c
--- /dev/null
+++ b/res/layout/logwindow.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+    
+    <TextView android:text="@string/speed_waiting"
+        android:singleLine="true"
+        android:id="@+id/speed"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+  <ListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" />
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 24332316..f0557545 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -125,7 +125,7 @@
     <string name="check_remote_tlscert_title">Except TLS Server</string>
     <string name="remote_tlscn_check_summary">Checks the Remote Server Certificate CN against a String</string>
     <string name="remote_tlscn_check_title">Certificate Hostname Check</string>
-    <string name="enter_tlscn_dialog">Enter the String against which the remote Server is checked. Openvpn will use prefix matching. &amp;quot;Server&amp;quot; matches &amp;quot;Server-1&amp;quot; and &amp;quot;Server-2&amp;quot;\\nLeave empty to check the CN against the server hostname.</string>
+    <string name="enter_tlscn_dialog">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;\\nLeave empty to check the CN against the server hostname.</string>
     <string name="enter_tlscn_title">Remote Hostname(CN)</string>
     <string name="tls_key_auth">Enables the TLS Key Authentication</string>
     <string name="tls_auth_file">TLS Auth File</string>
@@ -145,7 +145,7 @@
     <string name="ignore_routes_summary">Ignore routed pushed by the server.</string>
     <string name="default_route_summary">Redirects all Traffic over the VPN</string>
     <string name="use_default_title">Use default Route</string>
-    <string name="custom_route_message">Enter custom routes. Only enter destination in CIDR format. &amp;quot;10.0.0.0/8 2002::/16&amp;quot; would direct the networks 10.0.0.0/8 and 2002::/16 over the VPN.</string>
+    <string name="custom_route_message">Enter custom routes. Only enter destination in CIDR format. &quot;10.0.0.0/8 2002::/16&quot; would direct the networks 10.0.0.0/8 and 2002::/16 over the VPN.</string>
     <string name="custom_routes_title">Custom Routes</string>
     <string name="log_verbosity_level">Log verbosity level</string>
     <string name="float_summary">Allows authenticated packets from any IP</string>
@@ -216,5 +216,9 @@
     <string name="faq_security">"As openvpn is security sensitive a few notes about security are sensible. All data on the sdcard is inherently unsecure. Every app can read it (for example this program requires no special sd card rights). The data of this application can only be read by the application itself. By using the import option for cacert/cert/key in the file dialog the data is stored in the vpn profile. The vpn profiles are only accessable by this application. (Do not forget to delte the copies on the sdcard afterwards). Even though accessible only by this application the data is stil unecrypted. By rooting the telephone or other exploits it may be possible to retrieve the data. Saved passwords are stored in plain text as well. For pkcs12 files it is highly recommended that you import them into the android keystore."</string>
     <string name="import_vpn">Import</string>
     <string name="broken_image_cert_title">Error showing certificate selection</string>
-    <string name="broken_image_cert">Got an excption trying to show the Android 4.0+ certificate selction dialog. This should never happens as this a standard feature of Android 4.0+. Maybe your Android ROM support for certificate storage is broken</string>  
+    <string name="broken_image_cert">Got an excption trying to show the Android 4.0+ certificate selction dialog. This should never happens as this a standard feature of Android 4.0+. Maybe your Android ROM support for certificate storage is broken</string>
+    <string name="ipv4">IPv4</string>
+    <string name="ipv6">IPv6</string>
+    <string name="use_default_titlev6">TODO</string>
+    <string name="speed_waiting">Waiting byte count message</string>  
 </resources>
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