Add Log.d for QueryFailedException

3 files changed, 16 insertions, 12 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 f14978b39..202b750e4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
@@ -200,12 +200,12 @@ public class HkpKeyserver extends Keyserver {
     }
 
     @Override
-    public ArrayList<ImportKeysListEntry> search(String query) throws QueryException, TooManyResponses,
-            InsufficientQuery {
+    public ArrayList<ImportKeysListEntry> search(String query) throws QueryException,
+            QueryNeedsRepairException {
         ArrayList<ImportKeysListEntry> results = new ArrayList<ImportKeysListEntry>();
 
         if (query.length() < 3) {
-            throw new InsufficientQuery();
+            throw new QueryTooShortException();
         }
 
         String encodedQuery;
@@ -226,9 +226,9 @@ public class HkpKeyserver extends Keyserver {
                 if (e.getData().toLowerCase(Locale.US).contains("no keys found")) {
                     return results;
                 } else if (e.getData().toLowerCase(Locale.US).contains("too many")) {
-                    throw new TooManyResponses();
+                    throw new TooManyResponsesException();
                 } else if (e.getData().toLowerCase(Locale.US).contains("insufficient")) {
-                    throw new InsufficientQuery();
+                    throw new QueryTooShortException();
                 }
             }
             throw new QueryException("querying server(s) for '" + mHost + "' failed");
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 5b66b50c5..ec4b61671 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
@@ -34,8 +34,8 @@ public class KeybaseKeyserver extends Keyserver {
     private String mQuery;
 
     @Override
-    public ArrayList<ImportKeysListEntry> search(String query) throws QueryException, TooManyResponses,
-            InsufficientQuery {
+    public ArrayList<ImportKeysListEntry> search(String query) throws QueryException,
+            QueryNeedsRepairException {
         ArrayList<ImportKeysListEntry> results = new ArrayList<ImportKeysListEntry>();
 
         if (query.startsWith("0x")) {
@@ -84,6 +84,7 @@ public class KeybaseKeyserver extends Keyserver {
     }
 
     private ImportKeysListEntry makeEntry(JSONObject match) throws QueryException, JSONException {
+
         final ImportKeysListEntry entry = new ImportKeysListEntry();
         entry.setQuery(mQuery);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
index 19591eda8..7313a159b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
@@ -32,20 +32,23 @@ public abstract class Keyserver {
         }
     }
 
-    public static class TooManyResponses extends Exception {
+    public static class QueryNeedsRepairException extends Exception {
+        private static final long serialVersionUID = 2693768928624654512L;
+    }
+
+    public static class TooManyResponsesException extends QueryNeedsRepairException {
         private static final long serialVersionUID = 2703768928624654513L;
     }
 
-    public static class InsufficientQuery extends Exception {
-        private static final long serialVersionUID = 2703768928624654514L;
+    public static class QueryTooShortException extends QueryNeedsRepairException {
     }
 
     public static class AddKeyException extends Exception {
         private static final long serialVersionUID = -507574859137295530L;
     }
 
-    abstract List<ImportKeysListEntry> search(String query) throws QueryException, TooManyResponses,
-            InsufficientQuery;
+    abstract List<ImportKeysListEntry> search(String query) throws QueryException,
+            QueryNeedsRepairException;
 
     abstract String get(String keyIdHex) throws QueryException;