From 9e2afc72b16125f7c365b8d600f6f5df36aa8f48 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 13 May 2012 01:16:27 +0200
Subject: Config Import useable (closes issue #14) Correct save/restore state
 in Basic Settings (closes issue #17)

---
 res/drawable-hdpi/ic_menu_archive.png  | Bin 0 -> 1094 bytes
 res/drawable-mdpi/ic_menu_archive.png  | Bin 0 -> 831 bytes
 res/drawable-xhdpi/ic_menu_archive.png | Bin 0 -> 1398 bytes
 res/values/strings.xml                 |   6 +++++-
 res/xml/vpn_ipsettings.xml             |   9 ++++++++-
 5 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_menu_archive.png
 create mode 100644 res/drawable-mdpi/ic_menu_archive.png
 create mode 100644 res/drawable-xhdpi/ic_menu_archive.png

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_menu_archive.png b/res/drawable-hdpi/ic_menu_archive.png
new file mode 100644
index 00000000..e2d9bc1a
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_archive.png differ
diff --git a/res/drawable-mdpi/ic_menu_archive.png b/res/drawable-mdpi/ic_menu_archive.png
new file mode 100644
index 00000000..49ac569d
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_archive.png differ
diff --git a/res/drawable-xhdpi/ic_menu_archive.png b/res/drawable-xhdpi/ic_menu_archive.png
new file mode 100644
index 00000000..b1be9d5b
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_archive.png differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a5a88219..e2121d4b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -206,5 +206,9 @@
     <string name="importing_config">Importing config file from source %1$s</string>
     <string name="import_pkcs12_to_keystore">Your config file specified a pkcs12 file. Please import the file by selecting select in the Basic Settings configuration of the converted VPN</string>
     <string name="import_warning_custom_options">Your configuration had a few configuration options that could be parsed. These options were added as custom configuration options. The custom configuration is displayed below:</string>
-    <string name="import_done">Done reading config file.</string>  
+    <string name="import_done">Done reading config file.</string>
+    <string name="nobind_summary">Do not bind to local address and port</string>
+    <string name="no_bind">No local binding</string>
+    <string name="import_experimental">Please not that the config importer is an experimental feature.</string>
+    <string name="import_configuration_file">Import configuration file</string>  
 </resources>
diff --git a/res/xml/vpn_ipsettings.xml b/res/xml/vpn_ipsettings.xml
index 00774b65..fe55e8b4 100644
--- a/res/xml/vpn_ipsettings.xml
+++ b/res/xml/vpn_ipsettings.xml
@@ -18,7 +18,14 @@
             android:dependency="usePull"
             android:dialogMessage="@string/ipv6_dialog_tile"
             android:key="ipv6_address"
-            android:title="@string/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" />
+
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/dns" >
         <CheckBoxPreference
-- 
cgit v1.2.3