2 files changed, 9 insertions, 0 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 1949c9f19..e49085a0e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
@@ -316,6 +316,12 @@ public class HkpKeyserver extends Keyserver {
             while (uidMatcher.find()) {
                 String tmp = uidMatcher.group(1).trim();
                 if (tmp.contains("%")) {
+                    if(tmp.contains("%%")) {
+                        // This is a fix for issue #683
+                        // The server encodes a percent sign as %%, so it is swapped out with its
+                        // urlencoded counterpart to prevent errors
+                        tmp = tmp.replace("%%", "%25");
+                    }
                     try {
                         // converts Strings like "Universit%C3%A4t" to a proper encoding form "Universität".
                         tmp = (URLDecoder.decode(tmp, "UTF8"));
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 {