make transmitMessage call loki_message_api.sendMessage instead of webapi::sendMessage

libtextsecure/outgoing_message.js

@@ -146,26 +146,30 @@ OutgoingMessage.prototype = {
     return promise;
   },
 
-  transmitMessage(number, jsonData, timestamp) {
+  async transmitMessage(number, jsonData, timestamp) {
-    return this.server
+    const pubKey = number;
-      .sendMessages(number, jsonData, timestamp, this.silent)
+    const ttl = 2 * 24 * 60 * 60;
-      .catch(e => {
+    try {
-        if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410)) {
+      const result = await this.lokiserver.sendMessage(pubKey, JSON.stringify(jsonData), ttl);
-          // 409 and 410 should bubble and be handled by doSendMessage
+      return result;
-          // 404 should throw UnregisteredUserError
+    }
-          // all other network errors can be retried later.
+    catch(e) {
-          if (e.code === 404) {
+      if (e.name === 'HTTPError' && (e.code !== 409 && e.code !== 410)) {
-            throw new textsecure.UnregisteredUserError(number, e);
+        // 409 and 410 should bubble and be handled by doSendMessage
-          }
+        // 404 should throw UnregisteredUserError
-          throw new textsecure.SendMessageNetworkError(
+        // all other network errors can be retried later.
-            number,
+        if (e.code === 404) {
-            jsonData,
+          throw new textsecure.UnregisteredUserError(number, e);
-            e,
-            timestamp
-          );
         }
-        throw e;
+        throw new textsecure.SendMessageNetworkError(
-      });
+          number,
+          jsonData,
+          e,
+          timestamp
+        );
+      }
+      throw e;
+    }
   },
 
   getPaddedMessageLength(messageLength) {