aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2017-01-14 22:36:00 +0100
committerIngo Bauersachs <ingo@jitsi.org>2017-01-15 02:24:57 +0100
commit7d7da7a39356890a663eea993e4fcaefc8a28066 (patch)
treeb81d9ec757bc0d510fc5de431f5e83f7c1811def /src
parent225628c541c41b865049a0a1b1ec2ee08fe710d4 (diff)
downloadjitsi-7d7da7a39356890a663eea993e4fcaefc8a28066.zip
jitsi-7d7da7a39356890a663eea993e4fcaefc8a28066.tar.gz
jitsi-7d7da7a39356890a663eea993e4fcaefc8a28066.tar.bz2
Fix last message edit impersonation
Closes #299
Diffstat (limited to 'src')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java7
1 files changed, 5 insertions, 2 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 127e28b..0283e25 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
@@ -790,8 +790,6 @@ public class ChatConversationPanel
*/
public void correctMessage(final ChatMessage chatMessage)
{
- lastMessageUID = chatMessage.getMessageUID();
-
if (!SwingUtilities.isEventDispatchThread())
{
SwingUtilities.invokeLater(new Runnable()
@@ -805,6 +803,11 @@ public class ChatConversationPanel
}
String correctedUID = chatMessage.getCorrectedMessageUID();
+ if (correctedUID != null && correctedUID.equals(lastMessageUID))
+ {
+ lastMessageUID = chatMessage.getMessageUID();
+ }
+
Element root = document.getDefaultRootElement();
Element correctedMsgElement
= document.getElement(root,