send muc messages after join
This commit is contained in:
parent
f16690ae1f
commit
1bb38e25f2
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue