From 626cd2a40a1a28374195e4def37253a4eb528e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 17 Feb 2017 08:54:33 +0100
Subject: [PATCH] Fix UnsupportedCharsetException in add, closes #2057

---
 .../keyimport/ParcelableHkpKeyserver.java     | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableHkpKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableHkpKeyserver.java
index 0bb0f8372..76ddcdd72 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableHkpKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableHkpKeyserver.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016 Dominik Schürmann <dominik@dominikschuermann.de>
- * Copyright (C) 2011-2014 Thialfihar <thi@thialfihar.org>
+ * Copyright (C) 2016-2017 Dominik Schürmann <dominik@dominikschuermann.de>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -214,13 +213,7 @@ public class ParcelableHkpKeyserver extends Keyserver implements Parcelable {
                     .execute();
 
             // contains body both in case of success or failure
-            String responseBody;
-            byte[] responseBytes = response.body().bytes();
-            try {
-                responseBody = new String(responseBytes, response.body().contentType().charset(UTF_8));
-            } catch (UnsupportedCharsetException e) {
-                responseBody = new String(responseBytes, UTF_8);
-            }
+            String responseBody = getResponseBodyAsUtf8(response);
 
             if (response.isSuccessful()) {
                 return responseBody;
@@ -234,12 +227,21 @@ public class ParcelableHkpKeyserver extends Keyserver implements Parcelable {
         } catch (TlsCertificatePinning.TlsCertificatePinningException e) {
             Log.e(Constants.TAG, "Exception in pinning certs", e);
             throw new Keyserver.QueryFailedException("Exception in pinning certs");
-        } catch (UnsupportedCharsetException e) {
-            Log.e(Constants.TAG, "UnsupportedCharsetException", e);
-            throw new Keyserver.QueryFailedException("Unsupported charset");
         }
     }
 
+    private String getResponseBodyAsUtf8(Response response) throws IOException {
+        String responseBody;
+        byte[] responseBytes = response.body().bytes();
+        try {
+            responseBody = new String(responseBytes, response.body().contentType().charset(UTF_8));
+        } catch (UnsupportedCharsetException e) {
+            responseBody = new String(responseBytes, UTF_8);
+        }
+
+        return responseBody;
+    }
+
     /**
      * Results are sorted by creation date of key!
      */
@@ -261,6 +263,8 @@ public class ParcelableHkpKeyserver extends Keyserver implements Parcelable {
                     .addQueryParameter("search", query)
                     .build();
 
+            Log.d(Constants.TAG, "Keyserver search: " + url + " using Proxy: " + proxy.getProxy());
+
             data = query(url, proxy);
         } catch (URISyntaxException e) {
             Log.e(Constants.TAG, "Unsupported keyserver URI", e);
@@ -431,9 +435,11 @@ public class ParcelableHkpKeyserver extends Keyserver implements Parcelable {
                             .newCall(request)
                             .execute();
 
+            String responseBody = getResponseBodyAsUtf8(response);
+
             Log.d(Constants.TAG, "Adding key with URL: " + url
                     + ", response code: " + response.code()
-                    + ", body: " + response.body().string());
+                    + ", body: " + responseBody);
 
             if (response.code() != 200) {
                 throw new Keyserver.AddKeyException();