From b74e347fa8d15c73dd864c2b399cf2b164d68041 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Tue, 22 Jan 2013 09:38:57 +0000
Subject: [PATCH] Fixes android and debian source package compatibility.

---
 resources/install/build.xml                                | 4 ++--
 .../java/sip/communicator/service/httputil/HttpUtils.java  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/install/build.xml b/resources/install/build.xml
index b1bf23795..9dde725ab 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -2874,10 +2874,10 @@
         <!-- libhttpcore-java libhttpmime-java  libhttpclient-java -->
         <symlink resource="/usr/share/java/httpclient.jar"
              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"
              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"
              overwrite="true"
              link="${debian.src.dir}/lib/installer-exclude/httpmime-4.1.2.jar"/>
diff --git a/src/net/java/sip/communicator/service/httputil/HttpUtils.java b/src/net/java/sip/communicator/service/httputil/HttpUtils.java
index 2b15a027e..c268de475 100644
--- a/src/net/java/sip/communicator/service/httputil/HttpUtils.java
+++ b/src/net/java/sip/communicator/service/httputil/HttpUtils.java
@@ -493,8 +493,11 @@ else if(i == passwordParamIx && creds != null)
             }
         }
 
-        String s = URLEncodedUtils.format(parameters, Consts.UTF_8);
-        StringEntity entity = new StringEntity(s, Consts.UTF_8);
+        // Uses String UTF-8 to keep compatible with android version and
+        // 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"
         entity.setContentType(URLEncodedUtils.CONTENT_TYPE);