From d2a78ea84cd8c5be4573dae62c54c232e1f38a52 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sat, 1 Jun 2013 12:42:21 -0700
Subject: [PATCH] Fix for contrived NPE on invalid recipient during
 conversation compose.

---
 res/values/strings.xml                                   | 1 +
 src/org/thoughtcrime/securesms/ConversationActivity.java | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 20c4d4d0b5..804b63e844 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -81,6 +81,7 @@
     <string name="ConversationActivity_group_conversation">Group Conversation</string>
     <string name="ConversationActivity_d_recipients_in_group">%d recipients in group</string>    
     <string name="ConversationActivity_saving_draft">Saving draft...</string>
+    <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
     
     <!-- ConversationFragment -->
     <string name="ConversationFragment_message_details">Message details</string>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 01b5a5987a..664617bd63 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -300,6 +300,12 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
   }
 
   private void handleStartSecureSession() {
+    if (getRecipients() == null) {
+      Toast.makeText(this, getString(R.string.ConversationActivity_invalid_recipient),
+                     Toast.LENGTH_LONG).show();
+      return;
+    }
+
     final Recipient recipient   = getRecipients().getPrimaryRecipient();
     String recipientName        = (recipient.getName() == null ? recipient.getNumber() : recipient.getName());
     AlertDialog.Builder builder = new AlertDialog.Builder(this);