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

18
js/models/conversations.js
View file

@ -1257,10 +1257,24 @@
const sendOptions = this.getSendOptions();
let promise;
if (this.isMe()) {
const dataMessage = await textsecure.messaging.getMessageProto(
this.get('id'),
null,
[],
null,
[],
message.get('sent_at'),
expireTimer,
profileKey
);
return message.sendSyncMessageOnly(dataMessage);
}
if (this.get('type') === 'private') {
promise = textsecure.messaging.sendExpirationTimerUpdateToNumber(
this.get('id'),
this.get('expireTimer'),
expireTimer,
message.get('sent_at'),
profileKey,
sendOptions
@ -1269,7 +1283,7 @@
promise = textsecure.messaging.sendExpirationTimerUpdateToGroup(
this.get('id'),
this.getRecipients(),
this.get('expireTimer'),
expireTimer,
message.get('sent_at'),
profileKey,
sendOptions

11
js/models/messages.js
View file

@ -632,7 +632,7 @@
// back to the conversation's current recipients
const phoneNumbers = this.isIncoming()
? [this.get('source')]
: this.get('sent_to') || this.conversation.getRecipients();
: this.get('sent_to') || this.getConversation().getRecipients();
// This will make the error message for outgoing key errors a bit nicer
const allErrors = (this.get('errors') || []).map(error => {
@ -1062,8 +1062,15 @@
this.set({ dataMessage });
try {
await this.sendSyncMessage();
const result = await this.sendSyncMessage();
this.set({
// These are the same as a normal send
sent_to: [this.OUR_NUMBER],
sent: true,
expirationStartTimestamp: Date.now(),
unidentifiedDeliveries: result ? result.unidentifiedDeliveries : null,
// These are unique to a Note to Self message - immediately read/delivered
delivered_to: [this.OUR_NUMBER],
read_by: [this.OUR_NUMBER],
});