Charset handling fix in SIP IM messages. Provided by Ralph Weires.

src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicInstantMessagingSipImpl.java

@@ -401,16 +401,15 @@ private Request createMessage(Contact to, Message message)
 
         // Content params
         ContentTypeHeader contTypeHeader;
-        ContentEncodingHeader contEncodHeader;
         ContentLengthHeader contLengthHeader;
         try
         {
             contTypeHeader = this.sipProvider.getHeaderFactory()
                 .createContentTypeHeader(getType(message),
                                          getSubType(message));
-
-            contEncodHeader = this.sipProvider.getHeaderFactory()
-                .createContentEncodingHeader(message.getEncoding());
+            
+            if (! DEFAULT_MIME_ENCODING.equalsIgnoreCase(message.getEncoding()))
+                contTypeHeader.setParameter("charset", message.getEncoding());
 
             contLengthHeader = this.sipProvider.getHeaderFactory()
                 .createContentLengthHeader(message.getSize());
@@ -466,7 +465,6 @@ private Request createMessage(Contact to, Message message)
                 , ex);
         }
 
-        req.addHeader(contEncodHeader);
         req.addHeader(contLengthHeader);
 
         return req;
@@ -660,10 +658,7 @@ public void processTimeout(TimeoutEvent timeoutEvent)
             String content = null;
             try
             {
-                content = new String(
-                    req.getRawContent()
-                    , req.getContentEncoding()
-                        .getEncoding());
+                content = new String(req.getRawContent(), getCharset(req));
             }
             catch (UnsupportedEncodingException ex)
             {
@@ -736,10 +731,8 @@ public void processRequest(RequestEvent requestEvent)
 
             try
             {
-                content = new String(
-                    requestEvent.getRequest().getRawContent(),
-                    requestEvent.getRequest().getContentEncoding()
-                    .getEncoding());
+                Request req = requestEvent.getRequest();
+                content = new String(req.getRawContent(), getCharset(req));
             }
             catch (UnsupportedEncodingException ex)
             {
@@ -819,10 +812,7 @@ public void processResponse(ResponseEvent responseEvent)
 
             try
             {
-                content = new String(
-                    req.getRawContent(),
-                    req.getContentEncoding()
-                    .getEncoding());
+                content = new String(req.getRawContent(), getCharset(req));
             }
             catch (UnsupportedEncodingException exc)
             {
@@ -955,6 +945,27 @@ else if (status >= 200)
                 sentMsg.remove(key);
             }
         }
+        
+        /**
+         * Try to find a charset in a MESSAGE request for the
+         * text content. If no charset is defined, the default charset
+         * for text messages is returned.
+         * 
+         * @param req the MESSAGE request in which to look for a charset
+         * @return defined charset in the request or DEFAULT_MIME_ENCODING
+         *  if no charset is specified
+         */
+        private String getCharset(Request req)
+        {
+            String charset = null;
+            Header contentTypeHeader = req.getHeader(ContentTypeHeader.NAME);
+            if (contentTypeHeader instanceof ContentTypeHeader)
+                charset = ((ContentTypeHeader) contentTypeHeader)
+                                                .getParameter("charset");
+            if (charset == null)
+                charset = DEFAULT_MIME_ENCODING;
+            return charset;
+        }
 
         /**
          * Try to find a contact registered using a string to identify him.