diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-23 19:35:27 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-23 19:35:27 +0200 |
commit | 804f81199832636e6bed97ab37800bebd882867f (patch) | |
tree | 27eb568eccb3f1f1b9ca802550472a15c77fb76e /OpenKeychain/src | |
parent | bfd7c03b0a363d9652432abd7a26782e52152ceb (diff) | |
parent | 85bf24521df5feaaa762eeb78f99edde339b29a4 (diff) | |
download | open-keychain-804f81199832636e6bed97ab37800bebd882867f.tar.gz open-keychain-804f81199832636e6bed97ab37800bebd882867f.tar.bz2 open-keychain-804f81199832636e6bed97ab37800bebd882867f.zip |
Merge pull request #684 from da-kid/master
Fix of #683
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java index 2ec9e1c07..df1a7e937 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java @@ -316,6 +316,12 @@ public class HkpKeyserver extends Keyserver { while (uidMatcher.find()) { String tmp = uidMatcher.group(1).trim(); 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 { // converts Strings like "Universit%C3%A4t" to a proper encoding form "Universität". tmp = (URLDecoder.decode(tmp, "UTF8")); |