aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-06-23 13:42:58 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-23 13:42:58 +0200
commit8f4e66348de7cb271945ce15e513ccd4451f5227 (patch)
treebc4023167a4390c601283bb1d9eb4296e88fb842 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
parente8b96d1035aebf9ac7cb642868705736735849b1 (diff)
parentb48f727f985f10ecc10507f8971df36d848e4f55 (diff)
downloadopen-keychain-8f4e66348de7cb271945ce15e513ccd4451f5227.tar.gz
open-keychain-8f4e66348de7cb271945ce15e513ccd4451f5227.tar.bz2
open-keychain-8f4e66348de7cb271945ce15e513ccd4451f5227.zip
Merge pull request #681 from timbray/master
Handle empty keybase.io query, should fix #675
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 {