diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-10-09 19:40:30 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-10-09 19:40:30 +0200 |
| commit | 9e54fd5c92dd5b44f19fa5f225e29b28e3054198 (patch) | |
| tree | 4b4c9464e0fd512f35e2d079a88e3ec20a00c642 /src | |
| parent | cd1c05a7c3259578abb1782c22460e174800d4a3 (diff) | |
don't use sending state on muc pms without smacks
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index f6298ea2..5650b894 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1135,7 +1135,8 @@ public class XmppConnectionService extends Service { } if (packet != null) { - if (account.getXmppConnection().getFeatures().sm() || conversation.getMode() == Conversation.MODE_MULTI) { + if (account.getXmppConnection().getFeatures().sm() + || (conversation.getMode() == Conversation.MODE_MULTI && message.getCounterpart().isBareJid())) { message.setStatus(Message.STATUS_UNSEND); } else { message.setStatus(Message.STATUS_SEND); @@ -1177,7 +1178,8 @@ public class XmppConnectionService extends Service { if (resend) { if (packet != null && addToConversation) { - if (account.getXmppConnection().getFeatures().sm() || conversation.getMode() == Conversation.MODE_MULTI) { + if (account.getXmppConnection().getFeatures().sm() + || (conversation.getMode() == Conversation.MODE_MULTI && message.getCounterpart().isBareJid())) { markMessage(message, Message.STATUS_UNSEND); } else { markMessage(message, Message.STATUS_SEND); |