aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
diff options
context:
space:
mode:
authorAdithya Abraham Philip <adithyaphilip@gmail.com>2015-06-16 15:15:39 +0530
committerAdithya Abraham Philip <adithyaphilip@gmail.com>2015-07-03 20:46:15 +0530
commitbf2d9eda7c2a29186a1f69727221643e6629667a (patch)
treefb1b71c817990fb49c917222461c3bb14d3fd777 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
parentbde187b9bf9bbb334a12b6b18aa843048a926dc8 (diff)
downloadopen-keychain-bf2d9eda7c2a29186a1f69727221643e6629667a.tar.gz
open-keychain-bf2d9eda7c2a29186a1f69727221643e6629667a.tar.bz2
open-keychain-bf2d9eda7c2a29186a1f69727221643e6629667a.zip
added proxy logging, removed test function in KeybaseLib
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java3
1 files changed, 2 insertions, 1 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 8d32d80e0..d06b8b0c4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
@@ -232,7 +232,8 @@ public class HkpKeyserver extends Keyserver {
}
} catch (IOException e) {
e.printStackTrace();
- throw new QueryFailedException("Keyserver '" + mHost + "' is unavailable. Check your Internet connection!");
+ throw new QueryFailedException("Keyserver '" + mHost + "' is unavailable. Check your Internet connection!" +
+ proxy == null?"":" Using proxy " + proxy);
}
}