diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-20 00:16:01 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-20 00:16:01 +0200 |
| commit | 2f817e8adc632df9f5996aee7b578f1820422d11 (patch) | |
| tree | 0d42eca5d1cc3be9069f4972d3e0411e881d1102 /res | |
| parent | f0c15a0d3396d2a148bf1f1078fa68e7ebf9bcea (diff) | |
- Use config file name instead for default VPN name (closes issue #53)
- Allow importing the pkcs12 into the android keystone when converting configuration
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/config_converter.xml | 22 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/res/layout/config_converter.xml b/res/layout/config_converter.xml new file mode 100644 index 00000000..13733fb3 --- /dev/null +++ b/res/layout/config_converter.xml @@ -0,0 +1,22 @@ +<?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" > +<CheckBox + android:id="@+id/importpkcs12" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:checked="true" + android:text="@string/importpkcs12fromconfig" + android:visibility="gone" + /> + <ListView + android:id="@android:id/list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" /> + + + + </LinearLayout> + diff --git a/res/values/strings.xml b/res/values/strings.xml index 41015848..fca7a777 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -237,4 +237,5 @@ <string name="faq_howto_title">Quick Start</string> <string name="setting_loadtun_summary">Try to load the tun.ko kernel module before trying to connect. Needs rooted devices.</string> <string name="setting_loadtun">Load tun module</string> + <string name="importpkcs12fromconfig">Import PKCS12 from configuration into Android Keystore</string> </resources> |