aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-12-22 01:52:47 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-12-22 01:52:47 +0100
commit7e9ce855df4b9b2849a3382f437a50408bd9d21c (patch)
tree798b086cd1cebb7e7ecd08589245185d8085bedf
parent35e16b75b243fd301642bbf1572f85ebbef1c161 (diff)
downloadopen-keychain-7e9ce855df4b9b2849a3382f437a50408bd9d21c.tar.gz
open-keychain-7e9ce855df4b9b2849a3382f437a50408bd9d21c.tar.bz2
open-keychain-7e9ce855df4b9b2849a3382f437a50408bd9d21c.zip
Add hint to encrypt field
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java4
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml1
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
3 files changed, 2 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
index 065cfb5d0..f98fda56f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
@@ -88,10 +88,6 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView<KeyItem>
@Override
protected KeyItem defaultObject(String completionText) {
- // TODO: We could try to automagically download the key if it's unknown but a key id
- /*if (completionText.startsWith("0x")) {
-
- }*/
return null;
}
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index 56647ec65..ab1bf3d4a 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -40,6 +40,7 @@
<org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
android:id="@+id/recipient_list"
android:layout_width="match_parent"
+ android:hint="@string/label_to"
android:minHeight="56dip"
android:paddingLeft="8dp"
android:paddingRight="8dp"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index b94c09273..ebab53df6 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -150,7 +150,7 @@
<string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string>
<string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for YubiKey PIN</string>
<string name="label_asymmetric_from">"Sign with:"</string>
- <string name="label_to">"Encrypt to:"</string>
+ <string name="label_to">"Encrypt to"</string>
<string name="label_delete_after_encryption">"Delete files after encryption"</string>
<string name="label_delete_after_decryption">"Delete after decryption"</string>
<string name="label_encryption_algorithm">"Encryption algorithm"</string>