From e652cd62a450aa4bb284d717a1f0bd1b1d1b86a2 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 9 May 2012 23:58:37 +0200
Subject: add cipher option

---
 res/values/strings.xml           |  4 ++++
 res/xml/vpn_authentification.xml | 12 +++++++++---
 res/xml/vpn_headers.xml          |  3 +--
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 90009e8c..9073c0be 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -185,4 +185,8 @@
     <string name="faq_shortcut">Shortcut to start</string>  
     <string name="faq_howto_shortcut">You can place a shortcut to start OpenVPN on your desktop. Depending on your homescreen program you have to add a shortcut or a widget.</string>  
     <string name="no_vpn_support_image">Your image does not support the VPNService API,sorry :(</string>  
+    <string name="encryption">Encryption</string>  
+    <string name="cipher_dialog_title">Enter Encryption method</string>  
+    <string name="chipher_dialog_message">Enter the cipher key for openvpn. Leave empty to use default cipher</string>
+    <string name="settings_auth">Authentication/Encryption</string>  
 </resources>
diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml
index bd8d8ca5..79d69697 100644
--- a/res/xml/vpn_authentification.xml
+++ b/res/xml/vpn_authentification.xml
@@ -28,14 +28,20 @@
             android:title="@string/tls_auth_file" />
 
         <ListPreference
+            android:dependency="useTLSAuth"
             android:entries="@array/tls_directions_entries"
-                    android:dependency="useTLSAuth"
-            
             android:entryValues="@array/tls_directions_values"
             android:key="tls_direction"
             android:persistent="false"
             android:title="@string/tls_direction" />
     </PreferenceCategory>
-/>
+    <PreferenceCategory android:title="@string/encryption" >
+        <EditTextPreference
+            android:dialogMessage="@string/chipher_dialog_message"
+            android:dialogTitle="@string/cipher_dialog_title"
+            android:key="cipher"
+            android:persistent="false"
+            android:title="Encryption cipher" />
+    </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index f755dc8c..60ddce7c 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -15,8 +15,7 @@
         android:title="IP Settings" />
     <header
         android:fragment="de.blinkt.openvpn.Settings_Authentication"
-        android:summary="Authentication"
-        android:title="Authentication" />
+        android:title="@string/settings_auth" />
 
     <!-- android:icon="@drawable/ic_settings_display" -->
      <header
-- 
cgit v1.2.3