cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keyserver verification on addition

Browse Source
This commit is contained in:
Adithya Abraham Philip
2015-04-22 06:15:14 +05:30
parent b0c87e2372
commit 2571d25058
4 changed files with 420 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml Normal file
View File

@@ -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>

12
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -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>