diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-03 10:40:44 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-03 10:40:44 +0100 |
commit | 1274b0ef3998fdd3753ae9f930029c657e905ddf (patch) | |
tree | 3da9742ac2ca6af642058220b2faca7cd96dd91e /src/main/java/eu/siacs/conversations/parser | |
parent | f0798216d568bca30051ba5392263da31e78eb98 (diff) |
Revert "get rid of broken totalMessageCount for mam queries"
This reverts commit 58c6f9bfb283f5c54695b9662b5b4b08e5d4357f.
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser')
-rw-r--r-- | src/main/java/eu/siacs/conversations/parser/MessageParser.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index 60948918..d8eae969 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -271,7 +271,7 @@ public class MessageParser extends AbstractParser implements packet = f.first; isForwarded = true; serverMsgId = result.getAttribute("id"); - query.incrementMessageCount(); + query.incrementTotalCount(); } else if (query != null) { Log.d(Config.LOGTAG,account.getJid().toBareJid()+": received mam result from invalid sender"); return; @@ -411,7 +411,9 @@ public class MessageParser extends AbstractParser implements } } - if (query == null) { + if (query != null) { + query.incrementMessageCount(); + } else { mXmppConnectionService.updateConversationUi(); } |