diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/basic_settings.xml (renamed from res/layout/config.xml) | 0 | ||||
| -rw-r--r-- | res/layout/vpn_preference_layout.xml | 2 | ||||
| -rw-r--r-- | res/layout/vpn_preference_widget.xml | 8 | ||||
| -rw-r--r-- | res/values/arrays.xml | 9 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 | ||||
| -rw-r--r-- | res/xml/main_about.xml | 5 | ||||
| -rw-r--r-- | res/xml/main_headers.xml | 14 | ||||
| -rw-r--r-- | res/xml/vpn_authentification.xml | 6 | ||||
| -rw-r--r-- | res/xml/vpn_headers.xml | 26 | ||||
| -rw-r--r-- | res/xml/vpn_overview.xml | 15 | ||||
| -rw-r--r-- | res/xml/vpn_profile_list.xml | 4 |
11 files changed, 48 insertions, 46 deletions
diff --git a/res/layout/config.xml b/res/layout/basic_settings.xml index cfe8c6e..cfe8c6e 100644 --- a/res/layout/config.xml +++ b/res/layout/basic_settings.xml diff --git a/res/layout/vpn_preference_layout.xml b/res/layout/vpn_preference_layout.xml index 4d1f7e2..15fc91a 100644 --- a/res/layout/vpn_preference_layout.xml +++ b/res/layout/vpn_preference_layout.xml @@ -79,7 +79,7 @@ android:background="@android:drawable/divider_horizontal_dark" /> <ImageView - android:id="@+id/vpn_edit_settings" + android:id="@+id/quickedit_settings" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_gravity="center" diff --git a/res/layout/vpn_preference_widget.xml b/res/layout/vpn_preference_widget.xml deleted file mode 100644 index fef2300..0000000 --- a/res/layout/vpn_preference_widget.xml +++ /dev/null @@ -1,8 +0,0 @@ -<CheckBox - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+android:id/checkbox" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:focusable="false" - android:clickable="false" />
\ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index eb2c1b1..41d523e 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -8,6 +8,15 @@ <item>Static Keys</item> </string-array> + <string-array name="vpn_entry_types"> + <item>certs</item> + <item>pkcs12</item> + <item>keystore</item> + <item>userpw</item> + <item>statickeys</item> + </string-array> + + <string-array name="tls_directions"> <item>0</item> <item>1</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index a9c1b1d..79b7f8a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -93,8 +93,9 @@ <string name="auth_pwquery">Password</string> <string name="static_keys_info">For the static configuration the TLS Auth Keys will be used as static keys.</string> <string name="configure_the_vpn">Configure the VPN</string> - - + <string name="menu_add_profile">Add Profile</string> + <string name="add_profile_name_prompt">Enter a name identifying the new Profile</string> + <string name="duplicate_profile_name">Duplicate Profile Name</string> </resources> diff --git a/res/xml/main_about.xml b/res/xml/main_about.xml new file mode 100644 index 0000000..8e3e28d --- /dev/null +++ b/res/xml/main_about.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > + <de.blinkt.openvpn.AboutPreference /> + +</PreferenceScreen>
\ No newline at end of file diff --git a/res/xml/main_headers.xml b/res/xml/main_headers.xml new file mode 100644 index 0000000..a0c4f43 --- /dev/null +++ b/res/xml/main_headers.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<preference-headers xmlns:android="http://schemas.android.com/apk/res/android" > + + <header + android:fragment="de.blinkt.openvpn.VPNProfileList" + android:summary="List of all VPN, confusing to be here :)" + android:title="All your precious VPNs" /> + <header + android:fragment="de.blinkt.openvpn.AboutFragment" + android:summary="About Openvpn for Android" + android:title="About" /> + + +</preference-headers>
\ No newline at end of file diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml index 11ea3ab..949093d 100644 --- a/res/xml/vpn_authentification.xml +++ b/res/xml/vpn_authentification.xml @@ -3,9 +3,9 @@ <CheckBoxPreference android:key="remoteServerTLS" - android:summary="Checks whether the server use a TLS Server Certificate" + android:summary="Checks whether the server uses a TLS Server Certificate" android:title="Except TLS Server" /> - <de.blinkt.openvpn.VPNConfigPreference - android:title="Whaaaaats UUUUuuuuup?" /> + + <CheckBoxPreference android:key="useTLSAuth"/> </PreferenceScreen>
\ No newline at end of file diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml index 7d0ade3..424b441 100644 --- a/res/xml/vpn_headers.xml +++ b/res/xml/vpn_headers.xml @@ -1,23 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <preference-headers xmlns:android="http://schemas.android.com/apk/res/android" > - <header android:summary="Server, port and authentication method. Normally you should only settings specified here." > - android:title="Basic Setting" - <intent - android:targetClass="de.blinkt.openvpn.OpenVPNClient" - android:targetPackage="de.binkt.openvpn" /> - </header> + <header + android:fragment="de.blinkt.openvpn.BasicSettings" + android:summary="Server, port and authentication method. Normally you should only settings specified here." + android:title="Basic Settings" /> <!-- android:icon="@drawable/ic_settings_applications" --> + <header android:fragment="de.blinkt.openvpn.VPNPreferences$IP_Settings" android:summary="IP Address and Routing" android:title="IP Settings" /> - - <header + <header android:fragment="de.blinkt.openvpn.VPNPreferences$Authentication" android:summary="Authentication" android:title="Authentication" /> - <!-- android:icon="@drawable/ic_settings_display" --> <header @@ -33,14 +30,9 @@ android:name="someKey" android:value="someHeaderValue" /> </header> - - <!-- android:icon="@drawable/ic_settings_display" --> <header - android:summary="Launches an Intent." - android:title="Intent" > - <intent - android:action="android.intent.action.VIEW" - android:data="http://www.android.com" /> - </header> + android:fragment="de.blinkt.openvpn.ShowConfigFragment" + android:summary="Shows the generated openvpn Configuration File" + android:title="Generated Config" /> </preference-headers>
\ No newline at end of file diff --git a/res/xml/vpn_overview.xml b/res/xml/vpn_overview.xml deleted file mode 100644 index 053f252..0000000 --- a/res/xml/vpn_overview.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/vpn_settings_activity_title" > - - <PreferenceScreen - android:key="new_vpn" - android:title="@string/new_vpn" /> - - <PreferenceCategory - android:fragment="de.blinkt.openvpn.VPNList$ListFragment" - android:key="vpn_list" - android:title="@string/vpn" > - </PreferenceCategory> - -</PreferenceScreen> diff --git a/res/xml/vpn_profile_list.xml b/res/xml/vpn_profile_list.xml new file mode 100644 index 0000000..b1ce1a1 --- /dev/null +++ b/res/xml/vpn_profile_list.xml @@ -0,0 +1,4 @@ +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" + android:key="profiles_list" />
\ No newline at end of file |