From cc76e15b95af16a2030b02b9a5035126d3ba18da Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 2 Oct 2014 18:54:21 +0200
Subject: avoided unecessary message searchs

---
 .../services/XmppConnectionService.java            | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'src/eu/siacs/conversations/services')

diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index ffef19ed1..ea2b59038 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -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) {
-- 
cgit v1.2.3