cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add mr option in keyserver class before query (code simplification)

Browse Source
This commit is contained in:
Dominik Schürmann
2014-03-18 16:29:40 +01:00
parent d1f0374620
commit eebf1c171a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
View File

@@ -216,9 +216,9 @@ public class HkpKeyServer extends KeyServer {
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
return null; return null;
} }
String request = "/pks/lookup?op=index&search=" + encodedQuery + "&options=mr"; String request = "/pks/lookup?op=index&options=mr&search=" + encodedQuery;
String data = null; String data;
try { try {
data = query(request); data = query(request);
} catch (HttpError e) { } catch (HttpError e) {
@@ -279,7 +279,7 @@ public class HkpKeyServer extends KeyServer {
HttpClient client = new DefaultHttpClient(); HttpClient client = new DefaultHttpClient();
try { try {
HttpGet get = new HttpGet("http://" + mHost + ":" + mPort HttpGet get = new HttpGet("http://" + mHost + ":" + mPort
+ "/pks/lookup?op=get&search=" + PgpKeyHelper.convertKeyIdToHex(keyId) + "&options=mr"); + "/pks/lookup?op=get&options=mr&search=" + PgpKeyHelper.convertKeyIdToHex(keyId));
HttpResponse response = client.execute(get); HttpResponse response = client.execute(get);
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {