From 0b181743a3d6b1423e112b17a400b5ac4ac09bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 20 Sep 2015 22:42:50 +0200
Subject: Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned
 cert on add (OKC-01-018)

---
 .../src/main/res/layout/add_keyserver_dialog.xml   | 36 ++++++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml b/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml
index 78e9247ea..b83681537 100644
--- a/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml
@@ -9,21 +9,37 @@
     android:paddingRight="24dp"
     android:paddingTop="16dp">
 
-    <EditText
-        android:id="@+id/keyserver_url_edit_text"
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/keyserver_url_edit_text_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="8dp"
-        android:ems="10"
-        android:hint="@string/label_enter_keyserver_url"
-        android:imeOptions="actionDone" />
+        android:layout_marginBottom="8dp">
+
+        <EditText
+            android:id="@+id/keyserver_url_edit_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:ems="10"
+            android:hint="@string/label_enter_keyserver_url"
+            android:imeOptions="actionDone"
+            android:inputType="textUri" />
+
+    </android.support.design.widget.TextInputLayout>
+
+
+    <CheckBox
+        android:id="@+id/verify_connection_checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="true"
+        android:text="@string/label_verify_keyserver_connection" />
 
     <CheckBox
-        android:id="@+id/verify_keyserver_checkbox"
+        android:id="@+id/only_trusted_keyserver_checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/label_verify_keyserver"
-        android:checked="true"/>
+        android:checked="true"
+        android:text="@string/label_only_trusted_keyserver" />
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3