From 64a097f8edf4b8830e624b9c704c26bcedd8a0c2 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 16 May 2015 12:43:38 +0200
Subject: fixed npe in new message parser

---
 src/main/java/eu/siacs/conversations/parser/MessageParser.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index d254a863..d2fa2c24 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -375,7 +375,9 @@ public class MessageParser extends AbstractParser implements
 		if (displayed != null) {
 			if (packet.fromAccount(account)) {
 				Conversation conversation = mXmppConnectionService.find(account,counterpart.toBareJid());
-				mXmppConnectionService.markRead(conversation);
+				if (conversation != null) {
+					mXmppConnectionService.markRead(conversation);
+				}
 			} else {
 				updateLastseen(packet, account, true);
 				final Message displayedMessage = mXmppConnectionService.markMessage(account, from.toBareJid(), displayed.getAttribute("id"), Message.STATUS_SEND_DISPLAYED);
-- 
cgit v1.2.3