summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorschwabe <devnull@localhost>2012-04-28 19:58:02 +0200
committerschwabe <devnull@localhost>2012-04-28 19:58:02 +0200
commit63e466054c2f1d66e4618ac4d73208751f1e5bd1 (patch)
tree84a00021ec486093b406ec050087ee486f6e6958 /res
parent031186e74c9f174d05a09c4059def7bcbc558ac6 (diff)
Almost ready for version 0.4
Diffstat (limited to 'res')
-rw-r--r--res/layout/basic_settings.xml56
-rw-r--r--res/values-de/arrays.xml7
-rw-r--r--res/values/arrays.xml7
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/xml/vpn_authentification.xml27
5 files changed, 38 insertions, 65 deletions
diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml
index 4e6f549f..f6673491 100644
--- a/res/layout/basic_settings.xml
+++ b/res/layout/basic_settings.xml
@@ -212,60 +212,10 @@
style="@style/item"/>
</LinearLayout>
- <CheckBox
- android:id="@+id/show_advanced"
- style="@style/item"
- android:text="@string/show_advanced" />
-
- <LinearLayout
- android:id="@+id/advanced_options"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone" >
+
- <CheckBox
- android:id="@+id/useTLSAuth"
- style="@style/item"
- android:text="@string/useTLSAuth" />
-
- <LinearLayout
- android:id="@+id/tlsauth_options"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:layout_marginLeft="20sp" >
-
- <de.blinkt.openvpn.FileSelectLayout
- android:id="@+id/tlsAuth"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- blinkt:title="@string/tlsauth" />
-
- <TextView
- style="@style/item"
- android:text="@string/tls_direction"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
-
- <Spinner
- android:id="@+id/tls_direction"
- style="@style/item"
- android:entries="@array/tls_directions"
- android:prompt="@string/tls_direction" />
- </LinearLayout>
- </LinearLayout>
-
- <Button
- android:id="@+id/connect"
- style="@style/item"
- android:text="@string/connect" />
-
- <Button
- android:id="@+id/about"
- style="@style/item"
- android:text="@string/about" />
+
+
</LinearLayout>
</ScrollView> \ No newline at end of file
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 4c09d9e3..80244f3f 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string-array name="vpn_types">
- <item>Zertifikate</item>
- <item>PKCS12 Datei</item>
- <item>Android Keystore </item>
- <!-- <item>Shared Secret</item> -->
- </string-array>
-
<string-array name="tls_directions">
<item>0</item>
<item>1</item>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 41d523e3..51b727e4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -23,5 +23,12 @@
<item>Unspecified</item>
</string-array>
+ <string-array name="tls_directions_entries">
+ <item>0</item>
+ <item>1</item>
+ <item>GNA</item>
+ </string-array>
+
+
</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ee2a4113..89159094 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -97,6 +97,8 @@
<string name="add_profile_name_prompt">Enter a name identifying the new Profile</string>
<string name="duplicate_profile_name">Duplicate Profile Name</string>
<string name="profilename">Profile Name</string>
-
-
+ <string name="no_keystore_cert_selected">No User certificate selected.</string>
+ <string name="no_error_found">No error found</string>
+ <string name="config_error_found">Error in Configuration</string>
+ <string name="config_error_message">An error has been found in your VPN configuration:</string>
</resources>
diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml
index 3781211f..0444831b 100644
--- a/res/xml/vpn_authentification.xml
+++ b/res/xml/vpn_authentification.xml
@@ -12,8 +12,29 @@
<EditTextPreference
android:dependency="checkRemoteCN"
- android:dialogMessage="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;"
- android:title="Remote Hostname(CN)"
- android:key="remotecn"/>
+ android:dialogMessage="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."
+ android:key="remotecn"
+ android:title="Remote Hostname(CN)" />
+
+ <PreferenceCategory android:title="TLS Authentication" >
+ <SwitchPreference
+ android:key="useTLSAuth"
+ android:summary="Enables the TLS Key Authentication"
+ android:title="@string/useTLSAuth" />
+
+ <Preference
+ android:dependency="useTLSAuth"
+ android:key="tlsAuthFile"
+ android:title="Title Auth File" />
+
+ <ListPreference
+ android:dependency="useTLSAuth"
+ android:dialogMessage="Select the direction for TLS Auth."
+ android:entries="@array/tls_directions"
+ android:entryValues="@array/tls_directions_entries"
+ android:key="tls_direction"
+ android:title="TLS Direction"
+ android:persistent="false"/>
+ </PreferenceCategory>
</PreferenceScreen> \ No newline at end of file