From bf2d9eda7c2a29186a1f69727221643e6629667a Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Tue, 16 Jun 2015 15:15:39 +0530 Subject: added proxy logging, removed test function in KeybaseLib --- .../java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java | 3 ++- extern/KeybaseLib | 2 +- 2 files changed, 3 insertions(+), 2 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); } } diff --git a/extern/KeybaseLib b/extern/KeybaseLib index 187caa13d..22f44ec0b 160000 --- a/extern/KeybaseLib +++ b/extern/KeybaseLib @@ -1 +1 @@ -Subproject commit 187caa13d766fc92fa26b704183f6aebeb029f9e +Subproject commit 22f44ec0bf5d6fba9a41d846b7d188bf900b7b3b -- cgit v1.2.3