narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

avoid unnessary muc mam queries when message count is 0 after subject

Browse source
This commit is contained in:
Daniel Gultsch 2015-06-02 13:33:20 +02:00
parent ba5d0892a6
commit fe1cff016f
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/entities/Conversation.java
View file

@ -249,6 +249,12 @@ public class Conversation extends AbstractEntity implements Blockable {
this.mLastReceivedOtrMessageId = id; this.mLastReceivedOtrMessageId = id;
} }
public int countMessages() {
synchronized (this.messages) {
return this.messages.size();
}
}
public interface OnMessageFound { public interface OnMessageFound {
public void onMessageFound(final Message message); public void onMessageFound(final Message message);

2
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -367,7 +367,7 @@ public class MessageParser extends AbstractParser implements
if (packet.hasChild("subject") && isTypeGroupChat) { if (packet.hasChild("subject") && isTypeGroupChat) {
Conversation conversation = mXmppConnectionService.find(account, from.toBareJid()); Conversation conversation = mXmppConnectionService.find(account, from.toBareJid());
if (conversation != null && conversation.getMode() == Conversation.MODE_MULTI) { if (conversation != null && conversation.getMode() == Conversation.MODE_MULTI) {
conversation.setHasMessagesLeftOnServer(true); conversation.setHasMessagesLeftOnServer(conversation.countMessages() > 0);
conversation.getMucOptions().setSubject(packet.findChildContent("subject")); conversation.getMucOptions().setSubject(packet.findChildContent("subject"));
mXmppConnectionService.updateConversationUi(); mXmppConnectionService.updateConversationUi();
return; return;