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

Ensure conversation id in storeSession

Browse source
This commit is contained in:
Fedor Indutny 2021-09-10 10:17:32 -07:00 • committed by GitHub
parent 87747ebae2
commit 091f3653e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ts/SignalProtocolStore.ts
View file

@ -990,10 +990,12 @@ export class SignalProtocolStore extends EventsMixin {
}
const { uuid, deviceId } = qualifiedAddress;
const conversation = window.ConversationController.get(uuid.toString());
const conversationId = window.ConversationController.ensureContactIds({
uuid: uuid.toString(),
});
strictAssert(
conversation !== undefined,
`Conversation not found for uuid: ${uuid}`
conversationId !== undefined,
'storeSession: Ensure contact ids failed'
);
const id = qualifiedAddress.toString();
@ -1002,7 +1004,7 @@ export class SignalProtocolStore extends EventsMixin {
id,
version: 2,
ourUuid: qualifiedAddress.ourUuid.toString(),
conversationId: conversation.id,
conversationId: new UUID(conversationId).toString(),
uuid: uuid.toString(),
deviceId,
record: record.serialize().toString('base64'),
@ -1166,7 +1168,10 @@ export class SignalProtocolStore extends EventsMixin {
window.log.info('removeAllSessions: deleting sessions for', identifier);
const id = window.ConversationController.getConversationId(identifier);
strictAssert(id, `Conversation not found: ${identifier}`);
strictAssert(
id,
`removeAllSessions: Conversation not found: ${identifier}`
);
const entries = Array.from(this.sessions.values());