count all messages in a query

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/parser/MessageParser.java           | 6 
src/main/java/eu/siacs/conversations/services/MessageArchiveService.java | 5 
2 files changed, 3 insertions(+), 8 deletions(-)

Detailed changes

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.incrementTotalCount();
+			query.incrementMessageCount();
 		} else if (query != null) {
 			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": received mam result from invalid sender");
 			return;
@@ -411,9 +411,7 @@ public class MessageParser extends AbstractParser implements
 				}
 			}
 
-			if (query != null) {
-				query.incrementMessageCount();
-			} else {
+			if (query == null) {
 				mXmppConnectionService.updateConversationUi();
 			}
 

src/main/java/eu/siacs/conversations/services/MessageArchiveService.java

@@ -345,12 +345,9 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 			return this.account;
 		}
 
-		public void incrementTotalCount() {
-			this.totalCount++;
-		}
-
 		public void incrementMessageCount() {
 			this.messageCount++;
+			this.totalCount++;
 		}
 
 		public int getTotalCount() {