moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 19:22:14 -05:00
Code Issues Releases Wiki Activity

Fixed Issue #683 which caused OK to crash upon importing keys which contain percent signs.

Browse Source
This commit is contained in:
Daniel Albert 2014-06-23 19:10:50 +02:00
parent b43fb63753
commit f68cf2a435
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,6 +316,12 @@ public class HkpKeyserver extends Keyserver {
while (uidMatcher.find()) { while (uidMatcher.find()) {
String tmp = uidMatcher.group(1).trim(); String tmp = uidMatcher.group(1).trim();
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
// urlencoded counterpart to prevent errors
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"));