From c6f9b23def1684acd754e3db6712a7a5efbd5b42 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 9 Oct 2014 23:08:40 +0200
Subject: fixed npes

---
 src/eu/siacs/conversations/entities/Conversation.java | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 60afaa5d..b4c99dc1 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -139,6 +139,9 @@ public class Conversation extends AbstractEntity {
 	}
 
 	public String getLatestMarkableMessageId() {
+		if (this.messages == null) {
+			return null;
+		}
 		for(int i = this.messages.size() - 1; i >= 0; --i) {
 			if (this.messages.get(i).getStatus() <= Message.STATUS_RECEIVED && this.messages.get(i).markable) {
 				if (this.messages.get(i).isRead()) {
-- 
cgit v1.2.3