From 17383ddfe0cd9449bbd0476e1765cd29e8d37779 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Fri, 27 Mar 2015 10:37:59 -0700
Subject: [PATCH] fix NPE for incoming failed messages

Fixes #2807
// FREEBIE
---
 src/org/thoughtcrime/securesms/ConversationItem.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 8dd55021a2..d6179bad04 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -313,8 +313,10 @@ public class ConversationItem extends LinearLayout {
 
   private void setFailedStatusIcons() {
     dateText.setText(R.string.ConversationItem_error_not_delivered);
-    indicatorText.setText(R.string.ConversationItem_click_for_details);
-    indicatorText.setVisibility(View.VISIBLE);
+    if (indicatorText != null) {
+      indicatorText.setText(R.string.ConversationItem_click_for_details);
+      indicatorText.setVisibility(View.VISIBLE);
+    }
   }
 
   private void setFallbackStatusIcons() {