aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
diff options
context:
space:
mode:
authormar-v-in <github@rvin.mooo.com>2014-06-24 11:35:26 +0200
committermar-v-in <github@rvin.mooo.com>2014-06-24 11:35:26 +0200
commit997faac90e2d002af1b5f45ef1893b118231b656 (patch)
treea25ca77b766ded8deab065ed27dd391c715c86d4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
parent97de1592f05f9fbe2f23cd68ff9040db3f575ee0 (diff)
parentc865de4002a9751928969ef30a3a5a6f943249cc (diff)
downloadopen-keychain-997faac90e2d002af1b5f45ef1893b118231b656.tar.gz
open-keychain-997faac90e2d002af1b5f45ef1893b118231b656.tar.bz2
open-keychain-997faac90e2d002af1b5f45ef1893b118231b656.zip
Merge branch 'master' into hkps-by-default
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java')
-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 {