aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorAdithya Abraham Philip <adithyaphilip@gmail.com>2015-04-22 06:15:14 +0530
committerAdithya Abraham Philip <adithyaphilip@gmail.com>2015-04-22 06:16:50 +0530
commit2571d25058706ae2725e0a70db4fa1c7eacfc153 (patch)
tree26845588e80474d1ca945b9b76840ca8fab0c32d /OpenKeychain/src/main/res
parentb0c87e2372681d4f2de547b73d41b98d86bd564e (diff)
downloadopen-keychain-2571d25058706ae2725e0a70db4fa1c7eacfc153.tar.gz
open-keychain-2571d25058706ae2725e0a70db4fa1c7eacfc153.tar.bz2
open-keychain-2571d25058706ae2725e0a70db4fa1c7eacfc153.zip
keyserver verification on addition
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml29
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml12
2 files changed, 41 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml b/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml
new file mode 100644
index 000000000..78e9247ea
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:custom="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="16dp"
+ android:paddingLeft="24dp"
+ android:paddingRight="24dp"
+ android:paddingTop="16dp">
+
+ <EditText
+ android:id="@+id/keyserver_url_edit_text"
+ 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" />
+
+ <CheckBox
+ android:id="@+id/verify_keyserver_checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/label_verify_keyserver"
+ android:checked="true"/>
+
+</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d4c67aa23..fa8bd16b9 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -86,6 +86,7 @@
<string name="btn_encrypt_text">"Encrypt text"</string>
<string name="btn_add_email">"Add additional email address"</string>
<string name="btn_unlock">"Unlock"</string>
+ <string name="btn_add_keyserver">"Add"</string>
<!-- menu -->
<string name="menu_preferences">"Settings"</string>
@@ -152,6 +153,8 @@
<string name="label_enable_compression">"Enable compression"</string>
<string name="label_encrypt_filenames">"Encrypt filenames"</string>
<string name="label_hidden_recipients">"Hide recipients"</string>
+ <string name="label_verify_keyserver">"Verify Keyserver"</string>
+ <string name="label_enter_keyserver_url">"Enter Keyserver URL"</string>
<string name="pref_keyserver">"Search Keyserver"</string>
<string name="pref_keyserver_summary">"Search HKP keyserver"</string>
@@ -353,6 +356,8 @@
<string name="progress_con_saving">"consolidate: saving to cache…"</string>
<string name="progress_con_reimport">"consolidate: reimporting…"</string>
+ <string name="progress_verifying_keyserver_url">"verifying keyserver…"</string>
+
<!-- action strings -->
<string name="hint_cloud_search_hint">"Search via Name, Email…"</string>
@@ -645,6 +650,13 @@
<string name="view_key_fragment_no_system_contact">"&lt;none&gt;"</string>
+ <!-- Add keyserver -->
+ <string name="add_keyserver_dialog_title">"Add Keyserver"</string>
+ <string name="add_keyserver_verified">"Keyserver verified!"</string>
+ <string name="add_keyserver_without_verification">"Keyserver added without verification."</string>
+ <string name="add_keyserver_invalid_url">"Invalid URL!"</string>
+ <string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your internet connection."</string>
+
<!-- Navigation Drawer -->
<string name="nav_keys">"Keys"</string>
<string name="nav_encrypt_decrypt">"Encrypt/Decrypt"</string>