From 2dbeebac7797d6d9083239e887196edc78e7caaf Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 14 Jun 2017 09:45:38 -0700
Subject: [PATCH] Maintain placeholder encrypted body to avoid processing error

// FREEBIE
---
 .../securesms/sms/OutgoingIdentityDefaultMessage.java     | 6 +++++-
 .../securesms/sms/OutgoingIdentityVerifiedMessage.java    | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java b/src/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java
index df728de264..24890032ce 100644
--- a/src/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java
+++ b/src/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java
@@ -6,7 +6,11 @@ import org.thoughtcrime.securesms.recipients.Recipients;
 public class OutgoingIdentityDefaultMessage extends OutgoingTextMessage {
 
   public OutgoingIdentityDefaultMessage(Recipients recipients) {
-    super(recipients, "", -1);
+    this(recipients, "");
+  }
+
+  private OutgoingIdentityDefaultMessage(Recipients recipients, String body) {
+    super(recipients, body, -1);
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java b/src/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java
index 28683eb4f1..310fbc0035 100644
--- a/src/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java
+++ b/src/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java
@@ -6,7 +6,11 @@ import org.thoughtcrime.securesms.recipients.Recipients;
 public class OutgoingIdentityVerifiedMessage extends OutgoingTextMessage {
 
   public OutgoingIdentityVerifiedMessage(Recipients recipients) {
-    super(recipients, "", -1);
+    this(recipients, "");
+  }
+
+  private OutgoingIdentityVerifiedMessage(Recipients recipients, String body) {
+    super(recipients, body, -1);
   }
 
   @Override
@@ -16,6 +20,6 @@ public class OutgoingIdentityVerifiedMessage extends OutgoingTextMessage {
 
   @Override
   public OutgoingTextMessage withBody(String body) {
-    return new OutgoingIdentityVerifiedMessage(getRecipients());
+    return new OutgoingIdentityVerifiedMessage(getRecipients(), body);
   }
 }