From 21325bc922908ce3284c4392305e2abbfeadf934 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Fri, 1 Dec 2017 13:31:48 -0800 Subject: [PATCH] Move sync messages to silent = true (#1843) * Set silent = true for all sync messages * sendmessage.js: Remove brace-less if --- js/libtextsecure.js | 36 ++++++++++++++++++++++++------------ libtextsecure/sendmessage.js | 36 ++++++++++++++++++++++++------------ 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/js/libtextsecure.js b/js/libtextsecure.js index 3ceec56c0d..220bfb8189 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -39894,10 +39894,11 @@ MessageSender.prototype = { var proto = textsecure.protobuf.DataMessage.decode(encodedMessage); return new Promise(function(resolve, reject) { this.sendMessageProto(timestamp, numbers, proto, function(res) { - if (res.errors.length > 0) + if (res.errors.length > 0) { reject(res); - else + } else { resolve(res); + } }); }.bind(this)); }, @@ -39949,7 +39950,9 @@ MessageSender.prototype = { syncMessage.sent = sentMessage; var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + + var silent = true; + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); }, getProfile: function(number) { @@ -39970,7 +39973,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + var silent = true; + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); } return Promise.resolve(); @@ -39986,7 +39990,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + var silent = true; + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); } return Promise.resolve(); @@ -40003,7 +40008,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + var silent = true; + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); } return Promise.resolve(); @@ -40016,7 +40022,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.receiptMessage = receiptMessage; - return this.sendIndividualProto(sender, contentMessage, Date.now(), true /*silent*/); + var silent = true; + return this.sendIndividualProto(sender, contentMessage, Date.now(), silent); }, syncReadMessages: function(reads) { var myNumber = textsecure.storage.user.getNumber(); @@ -40033,7 +40040,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + var silent = true; + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); } return Promise.resolve(); @@ -40055,7 +40063,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.nullMessage = nullMessage; - return this.sendIndividualProto(destination, contentMessage, Date.now()).then(function() { + var silent = true; + return this.sendIndividualProto(destination, contentMessage, Date.now(), silent).then(function() { var verified = new textsecure.protobuf.Verified(); verified.state = state; verified.destination = destination; @@ -40068,7 +40077,7 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); }.bind(this)); } @@ -40084,14 +40093,17 @@ MessageSender.prototype = { } return new Promise(function(resolve, reject) { - this.sendMessageProto(timestamp, numbers, proto, function(res) { + var silent = true; + var callback = function(res) { res.dataMessage = proto.toArrayBuffer(); if (res.errors.length > 0) { reject(res); } else { resolve(res); } - }.bind(this)); + }.bind(this); + + this.sendMessageProto(timestamp, numbers, proto, callback, silent); }.bind(this)); }, diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js index ba55f97bb9..7cc8d92684 100644 --- a/libtextsecure/sendmessage.js +++ b/libtextsecure/sendmessage.js @@ -265,10 +265,11 @@ MessageSender.prototype = { var proto = textsecure.protobuf.DataMessage.decode(encodedMessage); return new Promise(function(resolve, reject) { this.sendMessageProto(timestamp, numbers, proto, function(res) { - if (res.errors.length > 0) + if (res.errors.length > 0) { reject(res); - else + } else { resolve(res); + } }); }.bind(this)); }, @@ -320,7 +321,9 @@ MessageSender.prototype = { syncMessage.sent = sentMessage; var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + + var silent = true; + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); }, getProfile: function(number) { @@ -341,7 +344,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + var silent = true; + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); } return Promise.resolve(); @@ -357,7 +361,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + var silent = true; + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); } return Promise.resolve(); @@ -374,7 +379,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + var silent = true; + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); } return Promise.resolve(); @@ -387,7 +393,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.receiptMessage = receiptMessage; - return this.sendIndividualProto(sender, contentMessage, Date.now(), true /*silent*/); + var silent = true; + return this.sendIndividualProto(sender, contentMessage, Date.now(), silent); }, syncReadMessages: function(reads) { var myNumber = textsecure.storage.user.getNumber(); @@ -404,7 +411,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + var silent = true; + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); } return Promise.resolve(); @@ -426,7 +434,8 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.nullMessage = nullMessage; - return this.sendIndividualProto(destination, contentMessage, Date.now()).then(function() { + var silent = true; + return this.sendIndividualProto(destination, contentMessage, Date.now(), silent).then(function() { var verified = new textsecure.protobuf.Verified(); verified.state = state; verified.destination = destination; @@ -439,7 +448,7 @@ MessageSender.prototype = { var contentMessage = new textsecure.protobuf.Content(); contentMessage.syncMessage = syncMessage; - return this.sendIndividualProto(myNumber, contentMessage, Date.now()); + return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent); }.bind(this)); } @@ -455,14 +464,17 @@ MessageSender.prototype = { } return new Promise(function(resolve, reject) { - this.sendMessageProto(timestamp, numbers, proto, function(res) { + var silent = true; + var callback = function(res) { res.dataMessage = proto.toArrayBuffer(); if (res.errors.length > 0) { reject(res); } else { resolve(res); } - }.bind(this)); + }.bind(this); + + this.sendMessageProto(timestamp, numbers, proto, callback, silent); }.bind(this)); },