From d7ab7715ed5bb16dd5fbd022d0e5f029fd7f7b00 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 8 Mar 2014 20:14:47 +0100
Subject: couple of otr related bug fixes and basic ping

---
 src/eu/siacs/conversations/ui/ConversationFragment.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/eu/siacs/conversations/ui/ConversationFragment.java')

diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index aab71208..62755c6c 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -378,6 +378,7 @@ public class ConversationFragment extends Fragment {
 	public void updateMessages() {
 		ConversationActivity activity = (ConversationActivity) getActivity();
 		List<Message> encryptedMessages = new LinkedList<Message>();
+		// TODO this.conversation could be null?!
 		for(Message message : this.conversation.getMessages()) {
 			if (message.getEncryption() == Message.ENCRYPTION_PGP) {
 				encryptedMessages.add(message);
-- 
cgit v1.2.3