avoided unecessary message searchs

This commit is contained in:
iNPUTmice 2014-10-02 18:54:21 +02:00
parent f8be57d43f
commit cc76e15b95
1 changed files with 20 additions and 12 deletions

View File

@ -1533,26 +1533,34 @@ public class XmppConnectionService extends Service {
public boolean markMessage(Account account, String recipient, String uuid,
int status) {
for (Conversation conversation : getConversations()) {
if (conversation.getContactJid().equals(recipient)
&& conversation.getAccount().equals(account)) {
return markMessage(conversation, uuid, status);
if (uuid == null) {
return false;
} else {
for (Conversation conversation : getConversations()) {
if (conversation.getContactJid().equals(recipient)
&& conversation.getAccount().equals(account)) {
return markMessage(conversation, uuid, status);
}
}
return false;
}
return false;
}
public boolean markMessage(Conversation conversation, String uuid,
int status) {
for (Message message : conversation.getMessages()) {
if (message.getUuid().equals(uuid)
|| (message.getStatus() >= Message.STATUS_SEND && uuid
.equals(message.getRemoteMsgId()))) {
markMessage(message, status);
return true;
if (uuid == null) {
return false;
} else {
for (Message message : conversation.getMessages()) {
if (uuid.equals(message.getUuid())
|| (message.getStatus() >= Message.STATUS_SEND && uuid
.equals(message.getRemoteMsgId()))) {
markMessage(message, status);
return true;
}
}
return false;
}
return false;
}
public void markMessage(Message message, int status) {