aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/generator
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-01-27 21:43:09 +0100
committerChristian Schneppe <christian@pix-art.de>2018-01-27 21:43:09 +0100
commit97504840d176c2b2dbd51e23d3c2b47c61d1331c (patch)
tree4008545eb4bb76e85d707674b8e9486c0696d0ab /src/main/java/de/pixart/messenger/generator
parent3d18291b6ef0df2f693efb872bc9bfddec9a864a (diff)
make chat markers opportunistic in private mucs
Diffstat (limited to 'src/main/java/de/pixart/messenger/generator')
-rw-r--r--src/main/java/de/pixart/messenger/generator/MessageGenerator.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java
index 0c91302c7..4be56b79f 100644
--- a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java
+++ b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java
@@ -53,8 +53,7 @@ public class MessageGenerator extends AbstractGenerator {
packet.setTo(message.getCounterpart().toBareJid());
packet.setType(MessagePacket.TYPE_GROUPCHAT);
}
- if (conversation.getMode() == Conversation.MODE_SINGLE ||
- (conversation.getMucOptions().nonanonymous() && conversation.getMucOptions().membersOnly() && message.getType() != Message.TYPE_PRIVATE)) {
+ if (conversation.isSingleOrPrivateAndNonAnonymous() && message.getType() != Message.TYPE_PRIVATE) {
packet.addChild("markable", "urn:xmpp:chat-markers:0");
}
packet.setFrom(account.getJid());