diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2011-10-01 12:29:25 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2011-10-01 13:06:23 +0200 |
| commit | e9416c3e98a2e4c24a70912caba04b45a857d089 (patch) | |
| tree | 1180e31a4a6610d52489bbf77a698396561aacfb /main/src | |
| parent | a8e9549246d9104f0cdca1f9ee5da729d0c5be86 (diff) | |
| download | cgeo-e9416c3e98a2e4c24a70912caba04b45a857d089.zip cgeo-e9416c3e98a2e4c24a70912caba04b45a857d089.tar.gz cgeo-e9416c3e98a2e4c24a70912caba04b45a857d089.tar.bz2 | |
Use Apache httpClient provided utilities
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/cgBase.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java index b7be150..2c41537 100644 --- a/main/src/cgeo/geocaching/cgBase.java +++ b/main/src/cgeo/geocaching/cgBase.java @@ -24,6 +24,7 @@ import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.utils.URLEncodedUtils; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.Scheme; @@ -3130,17 +3131,7 @@ public class cgBase { if (params == null) return ""; - final List<String> paramsEncoded = new ArrayList<String>(params.size()); - - for (final NameValuePair nameValue : params) { - final String key = nameValue.getName(); - final String value = StringUtils.defaultString(nameValue.getValue()); - - // TODO: Document the justification of the legacy test below - paramsEncoded.add((key.charAt(0) != '^' ? key : "") + "=" + urlencode_rfc3986(value)); - } - - return StringUtils.join(paramsEncoded.toArray(), '&'); + return URLEncodedUtils.format(params, HTTP.UTF_8); } static private String prepareParameters(final String baseUri, final Parameters params) { |