From e8548879db405d9bcd78b82a456ad8d655592c0f Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Mon, 20 Feb 2017 19:51:43 -0800
Subject: [PATCH] Stop sending legacy DataMessages

---
 js/libtextsecure.js               | 14 ++++++++------
 libtextsecure/outgoing_message.js | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 3f7e5a3171..14cb15a1d1 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38681,13 +38681,19 @@ textsecure.MessageReceiver.prototype = {
  * vim: ts=4:sw=4:expandtab
  */
 function OutgoingMessage(server, timestamp, numbers, message, callback) {
+    if (message instanceof textsecure.protobuf.DataMessage) {
+        var content = new textsecure.protobuf.Content();
+        content.dataMessage = message;
+        message = content;
+    }
     this.server = server;
     this.timestamp = timestamp;
     this.numbers = numbers;
-    this.message = message; // DataMessage or ContentMessage proto
+    this.message = message; // ContentMessage proto
     this.callback = callback;
     this.legacy = (message instanceof textsecure.protobuf.DataMessage);
 
+
     this.numbersCompleted = 0;
     this.errors = [];
     this.successfulNumbers = [];
@@ -38853,11 +38859,7 @@ OutgoingMessage.prototype = {
         };
 
         var content = btoa(encryptedMsg.body);
-        if (this.legacy) {
-            json.body = content;
-        } else {
-            json.content = content;
-        }
+        json.content = content;
 
         return json;
     },
diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js
index 1177b2db83..293569b902 100644
--- a/libtextsecure/outgoing_message.js
+++ b/libtextsecure/outgoing_message.js
@@ -2,13 +2,19 @@
  * vim: ts=4:sw=4:expandtab
  */
 function OutgoingMessage(server, timestamp, numbers, message, callback) {
+    if (message instanceof textsecure.protobuf.DataMessage) {
+        var content = new textsecure.protobuf.Content();
+        content.dataMessage = message;
+        message = content;
+    }
     this.server = server;
     this.timestamp = timestamp;
     this.numbers = numbers;
-    this.message = message; // DataMessage or ContentMessage proto
+    this.message = message; // ContentMessage proto
     this.callback = callback;
     this.legacy = (message instanceof textsecure.protobuf.DataMessage);
 
+
     this.numbersCompleted = 0;
     this.errors = [];
     this.successfulNumbers = [];
@@ -174,11 +180,7 @@ OutgoingMessage.prototype = {
         };
 
         var content = btoa(encryptedMsg.body);
-        if (this.legacy) {
-            json.body = content;
-        } else {
-            json.content = content;
-        }
+        json.content = content;
 
         return json;
     },