aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-07-31 18:42:54 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-07-31 18:42:54 +0200
commitb052d5e89cb323f528d568373605adaab03cb4a4 (patch)
treeddfeae52f16a247e4702a94f18621b8022c0284f
parentecb2c2c2b148ec1852cb5c59f2a23449f0488b1a (diff)
downloadopen-keychain-b052d5e89cb323f528d568373605adaab03cb4a4.tar.gz
open-keychain-b052d5e89cb323f528d568373605adaab03cb4a4.tar.bz2
open-keychain-b052d5e89cb323f528d568373605adaab03cb4a4.zip
Smaller notes
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java8
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_final_fragment.xml2
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
index f35ef45a2..8ff133164 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
@@ -221,6 +221,14 @@ public class HkpKeyserver extends Keyserver {
}
}
+ /**
+ * Results are sorted by creation date of key!
+ *
+ * @param query
+ * @return
+ * @throws QueryFailedException
+ * @throws QueryNeedsRepairException
+ */
@Override
public ArrayList<ImportKeysListEntry> search(String query) throws QueryFailedException,
QueryNeedsRepairException {
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index ddfbb325f..cc152a323 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -81,7 +81,7 @@
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="8dp"
- android:text="Creating the key can take up to 3 Minutes, be patient!"
+ android:text="Creating the key can take up to 3 Minutes, be patient!\n(3 subkeys, RSA, 4096 bit)"
android:textColor="@color/result_red"
android:textAppearance="?android:attr/textAppearanceMedium"
android:id="@+id/textView" />