diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-17 00:03:37 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-17 00:03:37 +0200 |
| commit | 38a9242955704232039272fd8b6011d47622495d (patch) | |
| tree | 16665564834041b3c1218531d548449e64285f8d /src/eu/siacs/conversations/parser | |
| parent | 670dead69502884d178ab60ec10e8e0e7b7a7915 (diff) | |
brought muc invites back. + couple of bug fixes + refactoring
Diffstat (limited to 'src/eu/siacs/conversations/parser')
| -rw-r--r-- | src/eu/siacs/conversations/parser/MessageParser.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java index 6c43a4d7d..728faf4b7 100644 --- a/src/eu/siacs/conversations/parser/MessageParser.java +++ b/src/eu/siacs/conversations/parser/MessageParser.java @@ -220,10 +220,13 @@ public class MessageParser extends AbstractParser implements } else if (packet.hasChild("x")) { Element x = packet.findChild("x"); if (x.hasChild("invite")) { - mXmppConnectionService + Conversation conversation = mXmppConnectionService .findOrCreateConversation(account, packet.getAttribute("from"), true); - mXmppConnectionService.updateConversationUi(); + if (!conversation.getMucOptions().online()) { + mXmppConnectionService.joinMuc(conversation); + mXmppConnectionService.updateConversationUi(); + } } } |