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

Cleanup in HkpKeyserver

Browse Source
This commit is contained in:
Dominik Schürmann 2015-04-20 13:53:00 +02:00
parent f2d3abd4c9
commit 7a097dd5df
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,7 +242,7 @@ public class HkpKeyserver extends Keyserver {
String encodedQuery; String encodedQuery;
try { try {
encodedQuery = URLEncoder.encode(query, "utf8"); encodedQuery = URLEncoder.encode(query, "UTF8");
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
return null; return null;
} }
@ -286,7 +286,7 @@ public class HkpKeyserver extends Keyserver {
entry.setAlgorithm(KeyFormattingUtils.getAlgorithmInfo(algorithmId, bitSize, null)); entry.setAlgorithm(KeyFormattingUtils.getAlgorithmInfo(algorithmId, bitSize, null));
// group 1 contains the full fingerprint (v4) or the long key id if available // group 1 contains the full fingerprint (v4) or the long key id if available
// see http://bit.ly/1d4bxbk and http://bit.ly/1gD1wwr // see https://bitbucket.org/skskeyserver/sks-keyserver/pull-request/12/fixes-for-machine-readable-indexes/diff
String fingerprintOrKeyId = matcher.group(1).toLowerCase(Locale.ENGLISH); String fingerprintOrKeyId = matcher.group(1).toLowerCase(Locale.ENGLISH);
if (fingerprintOrKeyId.length() > 16) { if (fingerprintOrKeyId.length() > 16) {
entry.setFingerprintHex(fingerprintOrKeyId); entry.setFingerprintHex(fingerprintOrKeyId);
@ -312,14 +312,13 @@ public class HkpKeyserver extends Keyserver {
String tmp = uidMatcher.group(1).trim(); String tmp = uidMatcher.group(1).trim();
if (tmp.contains("%")) { if (tmp.contains("%")) {
if (tmp.contains("%%")) { if (tmp.contains("%%")) {
// This is a fix for issue #683
// The server encodes a percent sign as %%, so it is swapped out with its // The server encodes a percent sign as %%, so it is swapped out with its
// urlencoded counterpart to prevent errors // urlencoded counterpart to prevent errors
tmp = tmp.replace("%%", "%25"); tmp = tmp.replace("%%", "%25");
} }
try { try {
// converts Strings like "Universit%C3%A4t" to a proper encoding form "Universität". // converts Strings like "Universit%C3%A4t" to a proper encoding form "Universität".
tmp = (URLDecoder.decode(tmp, "UTF8")); tmp = URLDecoder.decode(tmp, "UTF8");
} catch (UnsupportedEncodingException ignored) { } catch (UnsupportedEncodingException ignored) {
// will never happen, because "UTF8" is supported // will never happen, because "UTF8" is supported
} }