Fixes android and debian source package compatibility.

cusax-fix
Damian Minkov 13 years ago
parent b8b3f6c223
commit b74e347fa8

@ -2874,10 +2874,10 @@
<!-- libhttpcore-java libhttpmime-java libhttpclient-java --> <!-- libhttpcore-java libhttpmime-java libhttpclient-java -->
<symlink resource="/usr/share/java/httpclient.jar" <symlink resource="/usr/share/java/httpclient.jar"
overwrite="true" overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/httpclient-4.1.2.jar"/> link="${debian.src.dir}/lib/installer-exclude/httpclient-osgi-4.2.3.jar"/>
<symlink resource="/usr/share/java/httpcore.jar" <symlink resource="/usr/share/java/httpcore.jar"
overwrite="true" overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/httpcore-4.1.2.jar"/> link="${debian.src.dir}/lib/installer-exclude/httpcore-osgi-4.2.3.jar"/>
<symlink resource="/usr/share/java/httpmime.jar" <symlink resource="/usr/share/java/httpmime.jar"
overwrite="true" overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/httpmime-4.1.2.jar"/> link="${debian.src.dir}/lib/installer-exclude/httpmime-4.1.2.jar"/>

@ -493,8 +493,11 @@ else if(i == passwordParamIx && creds != null)
} }
} }
String s = URLEncodedUtils.format(parameters, Consts.UTF_8); // Uses String UTF-8 to keep compatible with android version and
StringEntity entity = new StringEntity(s, Consts.UTF_8); // older versions of the http client libs, as the one used
// in debian (4.1.x)
String s = URLEncodedUtils.format(parameters, "UTF-8");
StringEntity entity = new StringEntity(s, "UTF-8");
// set content type to "application/x-www-form-urlencoded" // set content type to "application/x-www-form-urlencoded"
entity.setContentType(URLEncodedUtils.CONTENT_TYPE); entity.setContentType(URLEncodedUtils.CONTENT_TYPE);

Loading…
Cancel
Save