moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

don't use sending state on muc pms without smacks

This commit is contained in:
Daniel Gultsch 2016-10-09 19:40:30 +02:00
parent cd1c05a7c3
commit 9e54fd5c92
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1135,7 +1135,8 @@ public class XmppConnectionService extends Service {
} }
if (packet != null) { 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); message.setStatus(Message.STATUS_UNSEND);
} else { } else {
message.setStatus(Message.STATUS_SEND); message.setStatus(Message.STATUS_SEND);
@ -1177,7 +1178,8 @@ public class XmppConnectionService extends Service {
if (resend) { if (resend) {
if (packet != null && addToConversation) { 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); markMessage(message, Message.STATUS_UNSEND);
} else { } else {
markMessage(message, Message.STATUS_SEND); markMessage(message, Message.STATUS_SEND);