From 58da3d12b0a59a32054478c53e6c5a219b71f61f Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Fri, 23 May 2014 09:42:32 -0700
Subject: Finished cleaning up rebase conflicts post Keyserver exception
 refactor

---
 .../keychain/keyimport/KeybaseKeyserver.java       | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
index ec4b61671..f9b6abf18 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
@@ -34,7 +34,7 @@ public class KeybaseKeyserver extends Keyserver {
     private String mQuery;
 
     @Override
-    public ArrayList<ImportKeysListEntry> search(String query) throws QueryException,
+    public ArrayList<ImportKeysListEntry> search(String query) throws QueryFailedException,
             QueryNeedsRepairException {
         ArrayList<ImportKeysListEntry> results = new ArrayList<ImportKeysListEntry>();
 
@@ -65,13 +65,13 @@ public class KeybaseKeyserver extends Keyserver {
             }
         } catch (Exception e) {
             Log.e(Constants.TAG, "keybase result parsing error", e);
-            throw new QueryException("Unexpected structure in keybase search result: " + e.getMessage());
+            throw new QueryFailedException("Unexpected structure in keybase search result: " + e.getMessage());
         }
 
         return results;
     }
 
-    private JSONObject getUser(String keybaseId) throws QueryException {
+    private JSONObject getUser(String keybaseId) throws QueryFailedException {
         try {
             return getFromKeybase("_/api/1.0/user/lookup.json?username=", keybaseId);
         } catch (Exception e) {
@@ -79,11 +79,11 @@ public class KeybaseKeyserver extends Keyserver {
             if (keybaseId != null) {
                 detail = ". Query was for user '" + keybaseId + "'";
             }
-            throw new QueryException(e.getMessage() + detail);
+            throw new QueryFailedException(e.getMessage() + detail);
         }
     }
 
-    private ImportKeysListEntry makeEntry(JSONObject match) throws QueryException, JSONException {
+    private ImportKeysListEntry makeEntry(JSONObject match) throws QueryFailedException, JSONException {
 
         final ImportKeysListEntry entry = new ImportKeysListEntry();
         entry.setQuery(mQuery);
@@ -128,7 +128,7 @@ public class KeybaseKeyserver extends Keyserver {
         return entry;
     }
 
-    private JSONObject getFromKeybase(String path, String query) throws QueryException {
+    private JSONObject getFromKeybase(String path, String query) throws QueryFailedException {
         try {
             String url = "https://keybase.io/" + path + URLEncoder.encode(query, "utf8");
             Log.d(Constants.TAG, "keybase query: " + url);
@@ -144,29 +144,29 @@ public class KeybaseKeyserver extends Keyserver {
                 try {
                     JSONObject json = new JSONObject(text);
                     if (JWalk.getInt(json, "status", "code") != 0) {
-                        throw new QueryException("Keybase autocomplete search failed");
+                        throw new QueryFailedException("Keybase autocomplete search failed");
                     }
                     return json;
                 } catch (JSONException e) {
-                    throw new QueryException("Keybase.io query returned broken JSON");
+                    throw new QueryFailedException("Keybase.io query returned broken JSON");
                 }
             } else {
                 String message = readAll(conn.getErrorStream(), conn.getContentEncoding());
-                throw new QueryException("Keybase.io query error (status=" + response +
+                throw new QueryFailedException("Keybase.io query error (status=" + response +
                         "): " + message);
             }
         } catch (Exception e) {
-            throw new QueryException("Keybase.io query error");
+            throw new QueryFailedException("Keybase.io query error");
         }
     }
 
     @Override
-    public String get(String id) throws QueryException {
+    public String get(String id) throws QueryFailedException {
         try {
             JSONObject user = getUser(id);
             return JWalk.getString(user, "them", "public_keys", "primary", "bundle");
         } catch (Exception e) {
-            throw new QueryException(e.getMessage());
+            throw new QueryFailedException(e.getMessage());
         }
     }
 
-- 
cgit v1.2.3