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

Properly initialize session reset send states

Browse source
This commit is contained in:
Evan Hahn 2021-09-23 15:21:35 -05:00 • committed by GitHub
parent 90bf5ee206
commit bf572cab9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ts/models/conversations.ts
View file

@ -63,7 +63,7 @@ import { getConversationMembers } from '../util/getConversationMembers';
import { sendReadReceiptsFor } from '../util/sendReadReceiptsFor';
import { updateConversationsWithUuidLookup } from '../updateConversationsWithUuidLookup';
import { ReadStatus } from '../messages/MessageReadStatus';
import { SendStatus } from '../messages/MessageSendState';
import { SendState, SendStatus } from '../messages/MessageSendState';
import * as durations from '../util/durations';
import {
concat,
@ -4260,18 +4260,27 @@ export class ConversationModel extends window.Backbone
async endSession(): Promise<void> {
if (isDirectConversation(this.attributes)) {
const now = Date.now();
const model = new window.Whisper.Message(({
const pendingSendState: SendState = {
status: SendStatus.Pending,
updatedAt: now,
};
const messageAttributes: Partial<MessageAttributesType> = {
conversationId: this.id,
type: 'outgoing',
sent_at: now,
received_at: window.Signal.Util.incrementMessageCounter(),
received_at_ms: now,
destination: this.get('e164'),
destinationUuid: this.get('uuid'),
recipients: this.getRecipients(),
sendStateByConversationId: {
[this.id]: pendingSendState,
[window.ConversationController.getOurConversationIdOrThrow()]: pendingSendState,
},
flags: Proto.DataMessage.Flags.END_SESSION,
// TODO: DESKTOP-722
} as unknown) as MessageAttributesType);
};
// TODO: DESKTOP-722
const model = new window.Whisper.Message(
messageAttributes as MessageAttributesType
);
const id = await window.Signal.Data.saveMessage(model.attributes);
model.set({ id });