From eb9b2ef31866d8172df25ac357733518d9375c4d Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 26 Feb 2013 22:56:15 -0800
Subject: [PATCH] Fix for NPE on null mms bytes.

---
 src/org/thoughtcrime/securesms/mms/MmsSendHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/mms/MmsSendHelper.java b/src/org/thoughtcrime/securesms/mms/MmsSendHelper.java
index 225b61f671..bb727a2d4b 100644
--- a/src/org/thoughtcrime/securesms/mms/MmsSendHelper.java
+++ b/src/org/thoughtcrime/securesms/mms/MmsSendHelper.java
@@ -40,7 +40,7 @@ public class MmsSendHelper extends MmsCommunication {
     AndroidHttpClient client = null;
 
     try {
-      Log.w("MmsSender", "Sending MMS1 of length: " + mms.length);
+      Log.w("MmsSender", "Sending MMS1 of length: " + (mms != null ? mms.length : "null"));
       client                 = constructHttpClient(context, parameters);
       URI targetUrl          = new URI(parameters.getMmsc());
       HttpHost target        = new HttpHost(targetUrl.getHost(), targetUrl.getPort(), HttpHost.DEFAULT_SCHEME_NAME);