diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-10-22 00:19:44 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-10-22 00:19:44 +0200 |
commit | 01bfe0c59a5bc3eba1db111d3bc687aac9be7847 (patch) | |
tree | e7d6d63eeed8514b9f3992dd09e1abd84932e9a5 /src/main/java/eu/siacs/conversations/generator/MessageGenerator.java | |
parent | 0a5a985cbe582e6f7ece37ec257fe53ccee4bb42 (diff) | |
parent | 85a25984f4bf4dfa2432fbc2c92f8117cf927fcf (diff) |
Merge trz/rename into trz/rebase
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/generator/MessageGenerator.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java index e698c151..2413c54e 100644 --- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java @@ -7,19 +7,18 @@ import java.util.TimeZone; import net.java.otr4j.OtrException; import net.java.otr4j.session.Session; + +import de.thedevstack.conversationsplus.ConversationsPlusPreferences; + import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.xml.Element; import eu.siacs.conversations.xmpp.chatstate.ChatState; import eu.siacs.conversations.xmpp.jid.Jid; import eu.siacs.conversations.xmpp.stanzas.MessagePacket; public class MessageGenerator extends AbstractGenerator { - public MessageGenerator(XmppConnectionService service) { - super(service); - } private MessagePacket preparePacket(Message message, boolean addDelay) { Conversation conversation = message.getConversation(); @@ -29,13 +28,13 @@ public class MessageGenerator extends AbstractGenerator { packet.setTo(message.getCounterpart()); packet.setType(MessagePacket.TYPE_CHAT); packet.addChild("markable", "urn:xmpp:chat-markers:0"); - if (this.mXmppConnectionService.indicateReceived()) { + if (ConversationsPlusPreferences.indicateReceived()) { packet.addChild("request", "urn:xmpp:receipts"); } } else if (message.getType() == Message.TYPE_PRIVATE) { packet.setTo(message.getCounterpart()); packet.setType(MessagePacket.TYPE_CHAT); - if (this.mXmppConnectionService.indicateReceived()) { + if (ConversationsPlusPreferences.indicateReceived()) { packet.addChild("request", "urn:xmpp:receipts"); } } else { |