Finished cleaning up rebase conflicts post Keyserver exception refactor

1 files changed, 5 insertions, 4 deletions

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 7313a159b..868f543f0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
@@ -24,10 +24,10 @@ import java.io.InputStream;
 import java.util.List;
 
 public abstract class Keyserver {
-    public static class QueryException extends Exception {
+    public static class QueryFailedException extends Exception {
         private static final long serialVersionUID = 2703768928624654512L;
 
-        public QueryException(String message) {
+        public QueryFailedException(String message) {
             super(message);
         }
     }
@@ -41,16 +41,17 @@ public abstract class Keyserver {
     }
 
     public static class QueryTooShortException extends QueryNeedsRepairException {
+        private static final long serialVersionUID = 2703768928624654514L;
     }
 
     public static class AddKeyException extends Exception {
         private static final long serialVersionUID = -507574859137295530L;
     }
 
-    abstract List<ImportKeysListEntry> search(String query) throws QueryException,
+    abstract List<ImportKeysListEntry> search(String query) throws QueryFailedException,
             QueryNeedsRepairException;
 
-    abstract String get(String keyIdHex) throws QueryException;
+    abstract String get(String keyIdHex) throws QueryFailedException;
 
     abstract void add(String armoredKey) throws AddKeyException;