Fixes html tags appearing in chat window when a smiley is sent.

4 files changed, 29 insertions, 13 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
index ee23837..87b2aed 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
@@ -554,7 +554,7 @@ public class ChatConversationPanel
      *
      * @param chatString the string to append
      */
-    public void appendMessageToEnd(String chatString)
+    public void appendMessageToEnd(String chatString, String contentType)
     {
         synchronized (scrollToBottomRunnable)
         {
@@ -602,7 +602,7 @@ public class ChatConversationPanel
                 || GuiActivator.getConfigurationService().getBoolean(
                     ReplacementProperty.getPropertyName("SMILEY"), true))
             {
-                processReplacement(elem, chatString);
+                processReplacement(elem, chatString, contentType);
             }
         }
     }
@@ -615,7 +615,9 @@ public class ChatConversationPanel
     * @param elem the element in the HTML Document.
     * @param chatString the message.
     */
-    private void processReplacement(final Element elem, final String chatString)
+    private void processReplacement(final Element elem,
+                                    final String chatString,
+                                    final String contentType)
     {
        final String chatFinal = chatString;
 
@@ -656,8 +658,14 @@ public class ChatConversationPanel
 
                    Matcher m = p.matcher(msgStore);
 
-                   String startPlainTextTag = START_PLAINTEXT_TAG;
-                   String endPlainTextTag = END_PLAINTEXT_TAG;
+                   String startPlainTextTag = "";
+                   String endPlainTextTag = "";
+
+                   if (!HTML_CONTENT_TYPE.equals(contentType))
+                   {
+                       startPlainTextTag = START_PLAINTEXT_TAG;
+                       endPlainTextTag = END_PLAINTEXT_TAG;
+                   }
 
                    int count = 0, startPos = 0;
                    StringBuffer msgBuff = new StringBuffer();
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index 6021c3b..decf5a5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -463,7 +463,8 @@ public class ChatPanel
             + GuiActivator.getResources().getI18NString("service.gui.IS_NOW",
                 new String[]{evt.getSourceMember().getName(),
                 getRoleDescription(evt.getNewRole())})
-                +"</DIV>");
+                +"</DIV>",
+            ChatConversationPanel.HTML_CONTENT_TYPE);
     }
 
     /**
@@ -477,7 +478,8 @@ public class ChatPanel
             "<DIV identifier=\"message\" style=\"color:#707070;\">"
             +GuiActivator.getResources().getI18NString("service.gui.ARE_NOW",
                 new String[]{
-                getRoleDescription(evt.getNewRole())}) +"</DIV>");
+                getRoleDescription(evt.getNewRole())}) +"</DIV>",
+            ChatConversationPanel.HTML_CONTENT_TYPE);
     }
 
     /**
@@ -652,7 +654,8 @@ public class ChatPanel
             }
 
             if (historyString != null)
-                conversationPanel.appendMessageToEnd(historyString);
+                conversationPanel.appendMessageToEnd(
+                    historyString, ChatConversationPanel.TEXT_CONTENT_TYPE);
         }
 
         fireChatHistoryChange();
@@ -819,7 +822,8 @@ public class ChatPanel
             }
         }
 
-        this.conversationPanel.appendMessageToEnd(processedMessage);
+        this.conversationPanel.appendMessageToEnd(
+            processedMessage, chatMessage.getContentType());
     }
 
     /**
@@ -2513,7 +2517,8 @@ public class ChatPanel
                 "<DIV identifier=\"message\" style=\"color:#707070;\">"
                 + event.getOldValue()
                 + " is now known as "
-                + event.getNewValue() + "</DIV>");
+                + event.getNewValue() + "</DIV>",
+                ChatConversationPanel.HTML_CONTENT_TYPE);
         
     }
 }
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
index 0493a38..d6f5714 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
@@ -646,7 +646,8 @@ public class ChatWritePanel
                 contactList += "</h5></DIV>";
 
                 chatPanel.getChatConversationPanel()
-                    .appendMessageToEnd(contactList);
+                    .appendMessageToEnd(contactList,
+                        ChatConversationPanel.HTML_CONTENT_TYPE);
             }
             else if(contacts.size() == 1)
             {
@@ -929,7 +930,8 @@ public class ChatWritePanel
                         .appendMessageToEnd("<h5>" +
                             GuiActivator.getResources().
                                 getI18NString("service.gui.MSG_NOT_POSSIBLE") +
-                            "</h5>");
+                            "</h5>",
+                            ChatConversationPanel.HTML_CONTENT_TYPE);
                 }
                 else
                 {
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
index 40a5db3..1759469 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
@@ -331,7 +331,8 @@ public class HistoryWindow
                     processedMessage = chatConvPanel.processMessage(
                             chatMessage, searchKeyword);
 
-                    chatConvPanel.appendMessageToEnd(processedMessage);
+                    chatConvPanel.appendMessageToEnd(processedMessage,
+                        ChatConversationPanel.TEXT_CONTENT_TYPE);
                 }
             }
         }