aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-08 20:14:47 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-08 20:14:47 +0100
commitd7ab7715ed5bb16dd5fbd022d0e5f029fd7f7b00 (patch)
tree6948a665942beba1949ba70440ba716198807995 /src/eu/siacs/conversations/ui
parent5a4328db7de0adf539da2cc3a73ee0e066bf436c (diff)
couple of otr related bug fixes and basic ping
Diffstat (limited to 'src/eu/siacs/conversations/ui')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java1
1 files changed, 1 insertions, 0 deletions
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);