Fix summary of Auth settings dialog and add TLS Profile setting

1 files changed, 55 insertions, 39 deletions

diff --git a/main/src/ui/res/xml/vpn_authentification.xml b/main/src/ui/res/xml/vpn_authentification.xml
index be24495a..770f6599 100644
--- a/main/src/ui/res/xml/vpn_authentification.xml
+++ b/main/src/ui/res/xml/vpn_authentification.xml
@@ -3,64 +3,80 @@
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory android:title="@string/tls_settings">
+        <ListPreference
+                android:entries="@array/tls_profile_entries"
+                android:entryValues="@array/tls_profile_values"
+                android:key="tls_profile"
+                android:persistent="false"
+                android:title="@string/tls_profile"
+                app:useSimpleSummaryProvider="true" />
         <CheckBoxPreference
-            android:key="remoteServerTLS"
-            android:summary="@string/check_remote_tlscert"
-            android:title="@string/check_remote_tlscert_title" />
+                android:key="remoteServerTLS"
+                android:summary="@string/check_remote_tlscert"
+                android:title="@string/check_remote_tlscert_title" />
         <CheckBoxPreference
-            android:key="checkRemoteCN"
-            android:summary="@string/remote_tlscn_check_summary"
-            android:title="@string/remote_tlscn_check_title" />
+                android:key="checkRemoteCN"
+                android:summary="@string/remote_tlscn_check_summary"
+                android:title="@string/remote_tlscn_check_title" />
 
         <de.blinkt.openvpn.views.RemoteCNPreference
-            android:dependency="checkRemoteCN"
-            android:positiveButtonText="@android:string/ok"
-            android:negativeButtonText="@string/cancel"
-            android:key="remotecn"
-            android:title="@string/enter_tlscn_title" />
+                android:dependency="checkRemoteCN"
+                android:key="remotecn"
+                android:negativeButtonText="@string/cancel"
+                android:positiveButtonText="@android:string/ok"
+                android:title="@string/enter_tlscn_title" />
 
         <EditTextPreference
-            android:dependency="checkRemoteCN"
-            android:dialogMessage="Field  in  the X.509 certificate subject to be used as the username (default=CN)."
-            android:key="remotex509name"
-            android:persistent="false"
-            android:title="X509 Username Field" />
+                android:dependency="checkRemoteCN"
+                android:dialogMessage="Field  in  the X.509 certificate subject to be used as the username (default=CN)."
+                android:key="remotex509name"
+                android:persistent="false"
+                android:title="X509 Username Field" />
 
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/tls_authentication">
         <SwitchPreference
-            android:key="useTLSAuth"
-            android:summary="@string/tls_key_auth"
-            android:title="@string/useTLSAuth" />
+
+                android:key="useTLSAuth"
+                android:summary="@string/tls_key_auth"
+                android:title="@string/useTLSAuth" />
 
         <Preference
-            android:dependency="useTLSAuth"
-            android:key="tlsAuthFile"
-            android:title="@string/tls_auth_file" />
+                android:dependency="useTLSAuth"
+
+                android:key="tlsAuthFile"
+                android:title="@string/tls_auth_file"
+                app:useSimpleSummaryProvider="true" />
 
         <ListPreference
-            android:dependency="useTLSAuth"
-            android:entries="@array/tls_directions_entries"
-            android:entryValues="@array/tls_directions_values"
-            android:key="tls_direction"
-            android:persistent="false"
-            android:title="@string/tls_direction" />
+                android:dependency="useTLSAuth"
+
+                android:entries="@array/tls_directions_entries"
+                android:entryValues="@array/tls_directions_values"
+                android:key="tls_direction"
+                android:persistent="false"
+                android:title="@string/tls_direction"
+                app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/encryption">
         <EditTextPreference
-            android:dialogMessage="@string/chipher_dialog_message"
-            android:dialogTitle="@string/cipher_dialog_title"
-            android:key="dataciphers"
-            android:persistent="false"
-            android:title="@string/encryption_cipher" />
+                android:dialogMessage="@string/chipher_dialog_message"
+                android:dialogTitle="@string/cipher_dialog_title"
+                android:key="dataciphers"
+                android:persistent="false"
+                android:title="@string/encryption_cipher"
+                app:useSimpleSummaryProvider="true" />
         <EditTextPreference
-            android:dialogMessage="@string/auth_dialog_message"
-            android:dialogTitle="@string/auth_dialog_title"
-            android:key="auth"
-            android:persistent="false"
-            android:title="@string/packet_auth" />
+                android:dialogMessage="@string/auth_dialog_message"
+                android:dialogTitle="@string/auth_dialog_title"
+                android:key="auth"
+                android:persistent="false"
+                android:title="@string/packet_auth"
+
+                app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file