- new Icon :)

- Obscure settings
- version 0.4.5
- quick launch

2 files changed, 45 insertions, 19 deletions

diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index dd942832..f755dc8c 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -19,13 +19,12 @@
         android:title="Authentication" />
 
     <!-- android:icon="@drawable/ic_settings_display" -->
-    <!--
      <header
         android:fragment="de.blinkt.openvpn.Settings_Obscure"
-        android:summary="Obscure OpenVPN Settings. Normaly not needed."
+        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_obscure.xml b/res/xml/vpn_obscure.xml
index 09b237f2..718f1920 100644
--- a/res/xml/vpn_obscure.xml
+++ b/res/xml/vpn_obscure.xml
@@ -2,41 +2,68 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="Obscure Settings" >
 
+    <ListPreference
+        android:entries="@array/verb_entries"
+        android:entryValues="@array/verb_values"
+        android:key="verblevel"
+        android:persistent="false"
+        android:summary="%s"
+        android:title="Log verbosity level" />
+
     <CheckBoxPreference
         android:key="useRandomHostname"
-        android:summary="adds 6 random chars in front of hostname"
-        android:title="Random Host Prefix" />
+        android:persistent="false"
+        android:summary="@string/random_host_summary"
+        android:title="@string/random_host_prefix" />
     <CheckBoxPreference
         android:key="useFloat"
-        android:summary="Allows authenticated packets from any IP" />
+        android:persistent="false"
+        android:summary="Allows authenticated packets from any IP"
+        android:title="Allow floating server" />
 
+    <!--
     <CheckBoxPreference android:key="setmtu" android:title="Set custom MTU" />
-    <EditTextPreference
+      <EditTextPreference
         android:dependency="setmtu"
         android:defaultValue="1500"
         android:title="MTU" />
+    -->
 
+
+    <!--
+	Shaping works only on outgoing packet, so it is rather uninteresting :(
     <CheckBoxPreference
+       android:persistent="false"
         android:key="useBWShaping"
-        android:title="Use bandwidth shaping" />
+        android:title="bandwidth shaping" 
+        android:summary="Limit Bandwidth of the VPN"/>
 
     <EditTextPreference
         android:key="shaperLimit"
-        android:title="Bandwidth in byte/s" />
+        android:dependency="useBWShaping"
+        android:title="Bandwidth in KByte/s" />
+    -->
 
-    <CheckBoxPreference
+
+    <!--
+         <CheckBoxPreference
         android:defaultValue="true"
         android:key="enableReplayProtection"
         android:title="Replay Protection" />
-    <CheckBoxPreference
-        android:summary="Specify custom options. Use with care!"
-        android:title="Enable Custom Options" 
-        android:key="enableCustomOptions"/>
+    -->
+    <PreferenceCategory android:title="@string/custom_config_title" >
+        <CheckBoxPreference
+            android:key="enableCustomOptions"
+            android:persistent="false"
+            android:summary="@string/custom_config_summary"
+            android:title="@string/custom_config_title" />
 
-    <EditTextPreference
-        android:dependency="enableCustomOptions"
-        android:dialogMessage="@string/custom_option_warning" />
-        android:key="customOptions"
-        android:title="Custom Options" />
+        <EditTextPreference
+            android:dependency="enableCustomOptions"
+            android:dialogMessage="@string/custom_option_warning"
+            android:key="customOptions"
+            android:persistent="false"
+            android:title="Custom Options" />
+    </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file