From f5a5fb2bd391877ff438e3a3b773df7eb822f02e Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 22 Nov 2017 21:58:38 +0100 Subject: save full jid when sending in muc. check chat markers against 'sender' --- .../java/de/pixart/messenger/generator/MessageGenerator.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java/de/pixart/messenger/generator/MessageGenerator.java') diff --git a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java index 4dae14757..acdaedcbe 100644 --- a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java +++ b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java @@ -170,13 +170,16 @@ public class MessageGenerator extends AbstractGenerator { return packet; } - public MessagePacket confirm(final Account account, final Jid to, final String id, final boolean groupChat) { + public MessagePacket confirm(final Account account, final Jid to, final String id, final Jid counterpart, final boolean groupChat) { MessagePacket packet = new MessagePacket(); packet.setType(groupChat ? MessagePacket.TYPE_GROUPCHAT : MessagePacket.TYPE_CHAT); packet.setTo(groupChat ? to.toBareJid() : to); packet.setFrom(account.getJid()); - Element received = packet.addChild("displayed", "urn:xmpp:chat-markers:0"); - received.setAttribute("id", id); + Element displayed = packet.addChild("displayed", "urn:xmpp:chat-markers:0"); + displayed.setAttribute("id", id); + if (groupChat && counterpart != null) { + displayed.setAttribute("sender", counterpart.toPreppedString()); + } packet.addChild("store", "urn:xmpp:hints"); return packet; } -- cgit v1.2.3