Stop sending legacy DataMessages

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;
     },

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;
     },