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

Note to Self timer fixes for bugs reported by beta users

Browse source
This commit is contained in:
Scott Nonnenberg 2019-02-14 09:36:24 -08:00
parent 7c4ba5446c
commit af40ceda6c
3 changed files with 34 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libtextsecure/sendmessage.js
View file

@ -846,7 +846,7 @@ MessageSender.prototype = {
)
);
const sendToContact = deleteAllSessions(number)
const sendToContactPromise = deleteAllSessions(number)
.catch(logError('resetSession/deleteAllSessions1 error:'))
.then(() => {
window.log.info(
@ -866,8 +866,14 @@ MessageSender.prototype = {
)
);
const myNumber = textsecure.storage.user.getNumber();
// We already sent the reset session to our other devices in the code above!
if (number === myNumber) {
return sendToContactPromise;
}
const buffer = proto.toArrayBuffer();
const sendSync = this.sendSyncMessage(
const sendSyncPromise = this.sendSyncMessage(
buffer,
timestamp,
number,
@ -877,7 +883,7 @@ MessageSender.prototype = {
options
).catch(logError('resetSession/sendSync error:'));
return Promise.all([sendToContact, sendSync]);
return Promise.all([sendToContactPromise, sendSyncPromise]);
},
sendMessageToGroup(