diff options
Diffstat (limited to 'src/eu/siacs/conversations/generator/MessageGenerator.java')
| -rw-r--r-- | src/eu/siacs/conversations/generator/MessageGenerator.java | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/generator/MessageGenerator.java b/src/eu/siacs/conversations/generator/MessageGenerator.java index 57b21fcf..a0bb7fb8 100644 --- a/src/eu/siacs/conversations/generator/MessageGenerator.java +++ b/src/eu/siacs/conversations/generator/MessageGenerator.java @@ -1,14 +1,19 @@ package eu.siacs.conversations.generator; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.TimeZone; + import net.java.otr4j.OtrException; import net.java.otr4j.session.Session; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.xml.Element; import eu.siacs.conversations.xmpp.stanzas.MessagePacket; public class MessageGenerator { - private MessagePacket preparePacket(Message message) { + private MessagePacket preparePacket(Message message, boolean addDelay) { Conversation conversation = message.getConversation(); Account account = conversation.getAccount(); MessagePacket packet = new MessagePacket(); @@ -21,15 +26,30 @@ public class MessageGenerator { } packet.setFrom(account.getFullJid()); packet.setId(message.getUuid()); + if (addDelay) { + addDelay(packet,message.getTimeSent()); + } return packet; } + private void addDelay(MessagePacket packet, long timestamp) { + final SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); + mDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + Element delay = packet.addChild("delay", "urn:xmpp:delay"); + Date date = new Date(timestamp); + delay.setAttribute("stamp", mDateFormat.format(date)); + } + public MessagePacket generateOtrChat(Message message) throws OtrException { + return generateOtrChat(message, false); + } + + public MessagePacket generateOtrChat(Message message, boolean addDelay) throws OtrException { Session otrSession = message.getConversation().getOtrSession(); if (otrSession==null) { throw new OtrException(null); } - MessagePacket packet = preparePacket(message); + MessagePacket packet = preparePacket(message,addDelay); packet.addChild("private", "urn:xmpp:carbons:2"); packet.addChild("no-copy", "urn:xmpp:hints"); packet.setBody(otrSession.transformSending(message @@ -38,13 +58,21 @@ public class MessageGenerator { } public MessagePacket generateChat(Message message) { - MessagePacket packet = preparePacket(message); + return generateChat(message, false); + } + + public MessagePacket generateChat(Message message, boolean addDelay) { + MessagePacket packet = preparePacket(message,addDelay); packet.setBody(message.getBody()); return packet; } public MessagePacket generatePgpChat(Message message) { - MessagePacket packet = preparePacket(message); + return generatePgpChat(message, false); + } + + public MessagePacket generatePgpChat(Message message, boolean addDelay) { + MessagePacket packet = preparePacket(message,addDelay); packet.setBody("This is an XEP-0027 encryted message"); if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) { packet.addChild("x", "jabber:x:encrypted").setContent( |