moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-25 16:01:52 -05:00
Code Issues Releases Wiki Activity

Finished cleaning up rebase conflicts post Keyserver exception refactor

Browse Source
This commit is contained in:
Tim Bray 2014-05-23 09:42:32 -07:00
parent 1ff3962acc
commit 58da3d12b0
6 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
View File

@ -166,12 +166,12 @@ public class HkpKeyserver extends Keyserver {
mPort = port; mPort = port;
} }
private String query(String request) throws QueryException, HttpError { private String query(String request) throws QueryFailedException, HttpError {
InetAddress ips[]; InetAddress ips[];
try { try {
ips = InetAddress.getAllByName(mHost); ips = InetAddress.getAllByName(mHost);
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
throw new QueryException(e.toString()); throw new QueryFailedException(e.toString());
} }
for (int i = 0; i < ips.length; ++i) { for (int i = 0; i < ips.length; ++i) {
try { try {
@ -196,11 +196,11 @@ public class HkpKeyserver extends Keyserver {
} }
} }
throw new QueryException("querying server(s) for '" + mHost + "' failed"); throw new QueryFailedException("querying server(s) for '" + mHost + "' failed");
} }
@Override @Override
public ArrayList<ImportKeysListEntry> search(String query) throws QueryException, public ArrayList<ImportKeysListEntry> search(String query) throws QueryFailedException,
QueryNeedsRepairException { QueryNeedsRepairException {
ArrayList<ImportKeysListEntry> results = new ArrayList<ImportKeysListEntry>(); ArrayList<ImportKeysListEntry> results = new ArrayList<ImportKeysListEntry>();
@ -231,7 +231,7 @@ public class HkpKeyserver extends Keyserver {
throw new QueryTooShortException(); throw new QueryTooShortException();
} }
} }
throw new QueryException("querying server(s) for '" + mHost + "' failed"); throw new QueryFailedException("querying server(s) for '" + mHost + "' failed");
} }
final Matcher matcher = PUB_KEY_LINE.matcher(data); final Matcher matcher = PUB_KEY_LINE.matcher(data);
@ -287,7 +287,7 @@ public class HkpKeyserver extends Keyserver {
} }
@Override @Override
public String get(String keyIdHex) throws QueryException { public String get(String keyIdHex) throws QueryFailedException {
HttpClient client = new DefaultHttpClient(); HttpClient client = new DefaultHttpClient();
try { try {
String query = "http://" + mHost + ":" + mPort + String query = "http://" + mHost + ":" + mPort +
@ -296,7 +296,7 @@ public class HkpKeyserver extends Keyserver {
HttpGet get = new HttpGet(query); HttpGet get = new HttpGet(query);
HttpResponse response = client.execute(get); HttpResponse response = client.execute(get);
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
throw new QueryException("not found"); throw new QueryFailedException("not found");
} }
HttpEntity entity = response.getEntity(); HttpEntity entity = response.getEntity();

24
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
View File

@ -34,7 +34,7 @@ public class KeybaseKeyserver extends Keyserver {
private String mQuery; private String mQuery;
@Override @Override
public ArrayList<ImportKeysListEntry> search(String query) throws QueryException, public ArrayList<ImportKeysListEntry> search(String query) throws QueryFailedException,
QueryNeedsRepairException { QueryNeedsRepairException {
ArrayList<ImportKeysListEntry> results = new ArrayList<ImportKeysListEntry>(); ArrayList<ImportKeysListEntry> results = new ArrayList<ImportKeysListEntry>();
@ -65,13 +65,13 @@ public class KeybaseKeyserver extends Keyserver {
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(Constants.TAG, "keybase result parsing error", 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; return results;
} }
private JSONObject getUser(String keybaseId) throws QueryException { private JSONObject getUser(String keybaseId) throws QueryFailedException {
try { try {
return getFromKeybase("_/api/1.0/user/lookup.json?username=", keybaseId); return getFromKeybase("_/api/1.0/user/lookup.json?username=", keybaseId);
} catch (Exception e) { } catch (Exception e) {
@ -79,11 +79,11 @@ public class KeybaseKeyserver extends Keyserver {
if (keybaseId != null) { if (keybaseId != null) {
detail = ". Query was for user '" + keybaseId + "'"; 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(); final ImportKeysListEntry entry = new ImportKeysListEntry();
entry.setQuery(mQuery); entry.setQuery(mQuery);
@ -128,7 +128,7 @@ public class KeybaseKeyserver extends Keyserver {
return entry; return entry;
} }
private JSONObject getFromKeybase(String path, String query) throws QueryException { private JSONObject getFromKeybase(String path, String query) throws QueryFailedException {
try { try {
String url = "https://keybase.io/" + path + URLEncoder.encode(query, "utf8"); String url = "https://keybase.io/" + path + URLEncoder.encode(query, "utf8");
Log.d(Constants.TAG, "keybase query: " + url); Log.d(Constants.TAG, "keybase query: " + url);
@ -144,29 +144,29 @@ public class KeybaseKeyserver extends Keyserver {
try { try {
JSONObject json = new JSONObject(text); JSONObject json = new JSONObject(text);
if (JWalk.getInt(json, "status", "code") != 0) { if (JWalk.getInt(json, "status", "code") != 0) {
throw new QueryException("Keybase autocomplete search failed"); throw new QueryFailedException("Keybase autocomplete search failed");
} }
return json; return json;
} catch (JSONException e) { } catch (JSONException e) {
throw new QueryException("Keybase.io query returned broken JSON"); throw new QueryFailedException("Keybase.io query returned broken JSON");
} }
} else { } else {
String message = readAll(conn.getErrorStream(), conn.getContentEncoding()); 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); "): " + message);
} }
} catch (Exception e) { } catch (Exception e) {
throw new QueryException("Keybase.io query error"); throw new QueryFailedException("Keybase.io query error");
} }
} }
@Override @Override
public String get(String id) throws QueryException { public String get(String id) throws QueryFailedException {
try { try {
JSONObject user = getUser(id); JSONObject user = getUser(id);
return JWalk.getString(user, "them", "public_keys", "primary", "bundle"); return JWalk.getString(user, "them", "public_keys", "primary", "bundle");
} catch (Exception e) { } catch (Exception e) {
throw new QueryException(e.getMessage()); throw new QueryFailedException(e.getMessage());
} }
} }

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
View File

@ -24,10 +24,10 @@ import java.io.InputStream;
import java.util.List; import java.util.List;
public abstract class Keyserver { public abstract class Keyserver {
public static class QueryException extends Exception { public static class QueryFailedException extends Exception {
private static final long serialVersionUID = 2703768928624654512L; private static final long serialVersionUID = 2703768928624654512L;
public QueryException(String message) { public QueryFailedException(String message) {
super(message); super(message);
} }
} }
@ -41,16 +41,17 @@ public abstract class Keyserver {
} }
public static class QueryTooShortException extends QueryNeedsRepairException { public static class QueryTooShortException extends QueryNeedsRepairException {
private static final long serialVersionUID = 2703768928624654514L;
} }
public static class AddKeyException extends Exception { public static class AddKeyException extends Exception {
private static final long serialVersionUID = -507574859137295530L; private static final long serialVersionUID = -507574859137295530L;
} }
abstract List<ImportKeysListEntry> search(String query) throws QueryException, abstract List<ImportKeysListEntry> search(String query) throws QueryFailedException,
QueryNeedsRepairException; QueryNeedsRepairException;
abstract String get(String keyIdHex) throws QueryException; abstract String get(String keyIdHex) throws QueryFailedException;
abstract void add(String armoredKey) throws AddKeyException; abstract void add(String armoredKey) throws AddKeyException;

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
View File

@ -211,7 +211,7 @@ public class ImportKeysListFragment extends ListFragment implements
@Override @Override
public Loader<AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>> public Loader<AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>>
onCreateLoader(int id, Bundle args) { onCreateLoader(int id, Bundle args) {
switch (id) { switch (id) {
case LOADER_ID_BYTES: { case LOADER_ID_BYTES: {
InputData inputData = getInputData(mKeyBytes, mDataUri); InputData inputData = getInputData(mKeyBytes, mDataUri);
@ -285,15 +285,15 @@ public class ImportKeysListFragment extends ListFragment implements
} else if (error instanceof Keyserver.QueryTooShortException) { } else if (error instanceof Keyserver.QueryTooShortException) {
AppMsg.makeText(getActivity(), R.string.error_keyserver_insufficient_query, AppMsg.makeText(getActivity(), R.string.error_keyserver_insufficient_query,
AppMsg.STYLE_ALERT).show(); AppMsg.STYLE_ALERT).show();
} else if (error instanceof Keyserver.QueryException) {
String alert = getActivity().getString(R.string.error_searching_keys);
alert = alert + " (" + error.getLocalizedMessage() + ")";
AppMsg.makeText(getActivity(), alert, AppMsg.STYLE_ALERT).show();
} else if (error instanceof Keyserver.TooManyResponsesException) { } else if (error instanceof Keyserver.TooManyResponsesException) {
AppMsg.makeText(getActivity(), R.string.error_keyserver_too_many_responses, AppMsg.makeText(getActivity(), R.string.error_keyserver_too_many_responses,
AppMsg.STYLE_ALERT).show(); AppMsg.STYLE_ALERT).show();
} else if (error instanceof Keyserver.QueryException) { } else if (error instanceof Keyserver.QueryFailedException) {
Log.d(Constants.TAG, "Key server query failed: " + error.getLocalizedMessage()); Log.d(Constants.TAG,
"Unrecoverable keyserver query error: " + error.getLocalizedMessage());
String alert = getActivity().getString(R.string.error_searching_keys);
alert = alert + " (" + error.getLocalizedMessage() + ")";
AppMsg.makeText(getActivity(), alert, AppMsg.STYLE_ALERT).show();
} }
break; break;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListKeybaseLoader.java
View File

@ -94,7 +94,7 @@ public class ImportKeysListKeybaseLoader
mEntryList.addAll(searchResult); mEntryList.addAll(searchResult);
mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null); mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null);
} catch (Keyserver.QueryException e) { } catch (Keyserver.QueryFailedException e) {
mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e); mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
} catch (Keyserver.QueryNeedsRepairException e) { } catch (Keyserver.QueryNeedsRepairException e) {
mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e); mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
View File

@ -116,7 +116,7 @@ public class ImportKeysListServerLoader
mEntryList.addAll(searchResult); mEntryList.addAll(searchResult);
} }
mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null); mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null);
} catch (Keyserver.QueryException e) { } catch (Keyserver.QueryFailedException e) {
mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e); mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
} catch (Keyserver.QueryNeedsRepairException e) { } catch (Keyserver.QueryNeedsRepairException e) {
mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e); mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);