diff options
author | iNPUTmice <daniel@gultsch.de> | 2015-01-24 00:22:51 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2015-01-24 00:22:51 +0100 |
commit | b9af38464e971e21a78f5c99d20d37fea73cc67e (patch) | |
tree | e648bd533b10c8d6940ce3423783052f73a8e121 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
parent | ed3d76bcf61080589dc1da65a4eec33bb5a0e44b (diff) |
fixed mam to work with muc
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index d4f40fec..ca80fa84 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1022,7 +1022,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa } this.databaseBackend.createConversation(conversation); } - if (account.getXmppConnection() != null && account.getXmppConnection().getFeatures().mam()) { + if (account.getXmppConnection() != null + && account.getXmppConnection().getFeatures().mam() + && !muc) { if (query == null) { this.mMessageArchiveService.query(conversation); } else { @@ -1314,6 +1316,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa conversation.setContactJid(joinJid); databaseBackend.updateConversation(conversation); } + conversation.setHasMessagesLeftOnServer(false); } else { account.pendingConferenceJoins.add(conversation); } |