diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 03:16:46 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 03:16:46 +0100 |
| commit | b0cb0346c17d4f136cbcc3660ff173584fe2b9c7 (patch) | |
| tree | a614b149a06fa336537092fc6d04a6b7d69bad05 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java | |
| parent | cf51366bb7863f68989e30dba86a0d2dc1e41ce3 (diff) | |
| parent | a41e6e0c705e8c927d1f905fad9b36e810dc5acc (diff) | |
| download | open-keychain-b0cb0346c17d4f136cbcc3660ff173584fe2b9c7.tar.gz open-keychain-b0cb0346c17d4f136cbcc3660ff173584fe2b9c7.tar.bz2 open-keychain-b0cb0346c17d4f136cbcc3660ff173584fe2b9c7.zip | |
Merge branch 'master' into v/decrypt-key-lookup
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 | 6 |
1 files changed, 3 insertions, 3 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 15e0d94e9..00e8d6ac5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java @@ -69,12 +69,12 @@ public abstract class Keyserver { private static final long serialVersionUID = -507574859137295530L; } - public abstract List<ImportKeysListEntry> search(String query, Proxy proxy) + public abstract List<ImportKeysListEntry> search(String query) throws QueryFailedException, QueryNeedsRepairException; - public abstract String get(String keyIdHex, Proxy proxy) throws QueryFailedException; + public abstract String get(String keyIdHex) throws QueryFailedException; - public abstract void add(String armoredKey, Proxy proxy) throws AddKeyException; + public abstract void add(String armoredKey) throws AddKeyException; public static String readAll(InputStream in, String encoding) throws IOException { ByteArrayOutputStream raw = new ByteArrayOutputStream(); |