aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
diff options
context:
space:
mode:
authorDaniel Albert <albert_daniel@t-online.de>2014-06-23 19:24:42 +0200
committerDaniel Albert <albert_daniel@t-online.de>2014-06-23 19:24:42 +0200
commit85bf24521df5feaaa762eeb78f99edde339b29a4 (patch)
tree96b9511740f4010bb900b716a000eefbaacdca80 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
parentf68cf2a435f493968591cd948fe6e5400b7da435 (diff)
parent8f4e66348de7cb271945ce15e513ccd4451f5227 (diff)
downloadopen-keychain-85bf24521df5feaaa762eeb78f99edde339b29a4.tar.gz
open-keychain-85bf24521df5feaaa762eeb78f99edde339b29a4.tar.bz2
open-keychain-85bf24521df5feaaa762eeb78f99edde339b29a4.zip
Merge branch 'master' of https://github.com/da-kid/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
index 29ab06264..0ca6f07fd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
@@ -42,6 +42,9 @@ public class KeybaseKeyserver extends Keyserver {
// cut off "0x" if a user is searching for a key id
query = query.substring(2);
}
+ if (query.isEmpty()) {
+ throw new QueryTooShortException();
+ }
mQuery = query;
try {