diff --git a/js/models/conversations.js b/js/models/conversations.js index 3b99c6bda..8744c2fa8 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -2019,9 +2019,7 @@ this.ourNumber, { syncMessage: true } ); - await this.wrapSend( - textsecure.messaging.syncReadMessages(read, sendOptions) - ); + await textsecure.messaging.syncReadMessages(read, sendOptions); // FIXME AUDRIC // if (storage.get('read-receipt-setting')) { diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js index 73058949e..656941eb9 100644 --- a/libtextsecure/sendmessage.js +++ b/libtextsecure/sendmessage.js @@ -351,36 +351,6 @@ MessageSender.prototype = { }); }, - async sendMessage(attrs, options) { - const message = new Message(attrs); - const silent = false; - const publicServer = - options.publicSendData && options.publicSendData.serverAPI; - - await Promise.all([ - this.uploadAttachments(message, publicServer), - this.uploadThumbnails(message, publicServer), - this.uploadLinkPreviews(message, publicServer), - ]); - - return new Promise((resolve, reject) => { - this.sendMessageProto( - message.timestamp, - message.recipients, - message.toProto(), - res => { - res.dataMessage = message.toArrayBuffer(); - if (res.errors.length > 0) { - reject(res); - } else { - resolve(res); - } - }, - silent, - options - ); - }); - }, sendMessageProto( timestamp, numbers, @@ -699,7 +669,6 @@ textsecure.MessageSender = function MessageSenderWrapper(username, password) { this.sendOpenGroupsSyncMessage = sender.sendOpenGroupsSyncMessage.bind( sender ); - this.sendMessage = sender.sendMessage.bind(sender); this.updateMediumGroup = sender.updateMediumGroup.bind(sender); this.requestSenderKeys = sender.requestSenderKeys.bind(sender); this.uploadAvatar = sender.uploadAvatar.bind(sender);