sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

send muc messages after join

This commit is contained in:
Daniel Gultsch 2016-02-10 09:53:48 +01:00
parent f16690ae1f
commit 1bb38e25f2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,7 +282,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} }
List<Conversation> conversations = getConversations(); List<Conversation> conversations = getConversations();
for (Conversation conversation : conversations) { for (Conversation conversation : conversations) {
if (conversation.getAccount() == account) { if (conversation.getAccount() == account && conversation.getMode() == Conversation.MODE_SINGLE) {
conversation.startOtrIfNeeded(); conversation.startOtrIfNeeded();
sendUnsentMessages(conversation); sendUnsentMessages(conversation);
} }
@ -1776,6 +1776,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
if (conversation.getMucOptions().mamSupport()) { if (conversation.getMucOptions().mamSupport()) {
getMessageArchiveService().catchupMUC(conversation); getMessageArchiveService().catchupMUC(conversation);
} }
sendUnsentMessages(conversation);
} }
@Override @Override