From c2b809c7c64efe602363f7420befe344716ee131 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 3 Dec 2013 08:21:31 -0800
Subject: [PATCH] Fix for long multipart message bug on some ROMs.

---
 .../securesms/transport/SmsTransport.java           | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/transport/SmsTransport.java b/src/org/thoughtcrime/securesms/transport/SmsTransport.java
index 7ba1fd3bc0..eb2fb14a8c 100644
--- a/src/org/thoughtcrime/securesms/transport/SmsTransport.java
+++ b/src/org/thoughtcrime/securesms/transport/SmsTransport.java
@@ -98,10 +98,17 @@ public class SmsTransport {
       Log.w("SmsTransport", npe);
       Log.w("SmsTransport", "Recipient: " + recipient);
       Log.w("SmsTransport", "Message Parts: " + messages.size());
-      for (String messagePart: messages) {
-          Log.w("SmsTransport", "Message Part Length: " + messagePart.getBytes().length);
+
+      try {
+        for (int i=0;i<messages.size();i++) {
+          SmsManager.getDefault().sendTextMessage(recipient, null, messages.get(i),
+                                                  sentIntents.get(i),
+                                                  deliveredIntents == null ? null : deliveredIntents.get(i));
+        }
+      } catch (NullPointerException npe2) {
+        Log.w("SmsTransport", npe);
+        throw new UndeliverableMessageException(npe2);
       }
-      throw new UndeliverableMessageException(npe);
     }
   }