diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-25 13:55:29 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-25 13:55:29 +0200 |
commit | 13d4a6d902d61a0a85db3bdc07996b317f5ecaad (patch) | |
tree | 9b2baff477a5b9b58e366a05633f6c4e8642b174 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java | |
parent | 8a2ffd8f90e9653ed69f945a94f6b9702dbdfff4 (diff) | |
parent | 58da3d12b0a59a32054478c53e6c5a219b71f61f (diff) | |
download | open-keychain-13d4a6d902d61a0a85db3bdc07996b317f5ecaad.tar.gz open-keychain-13d4a6d902d61a0a85db3bdc07996b317f5ecaad.tar.bz2 open-keychain-13d4a6d902d61a0a85db3bdc07996b317f5ecaad.zip |
Merge pull request #632 from timbray/master
Refactor server query exceptions again
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java | 18 |
1 files changed, 11 insertions, 7 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 19591eda8..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,19 +24,23 @@ 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); } } - 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 { + public static class QueryTooShortException extends QueryNeedsRepairException { private static final long serialVersionUID = 2703768928624654514L; } @@ -44,10 +48,10 @@ public abstract class Keyserver { private static final long serialVersionUID = -507574859137295530L; } - abstract List<ImportKeysListEntry> search(String query) throws QueryException, TooManyResponses, - InsufficientQuery; + 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; |