mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Move sync messages to silent = true (#1843)

Browse source 
* Set silent = true for all sync messages

* sendmessage.js: Remove brace-less if
This commit is contained in:
Scott Nonnenberg 2017-12-01 13:31:48 -08:00 • committed by GitHub
parent 6cb8b99637
commit 21325bc922
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
js/libtextsecure.js
View file

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

36
libtextsecure/sendmessage.js
View file

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