Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reuse global locks, handle empty envelopes

Browse Source
This commit is contained in:
Fedor Indutny
2021-05-19 11:33:14 -07:00
committed by Scott Nonnenberg
parent 25f271e61c
commit 1f0119a7ac
5 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ts/textsecure/MessageReceiver.ts
View File

@@ -49,6 +49,7 @@ import WebSocketResource, {
import Crypto from './Crypto';
import { deriveMasterKeyFromGroupV1, typedArrayToArrayBuffer } from '../Crypto';
import { ContactBuffer, GroupBuffer } from './ContactsParser';
import { assert } from '../util/assert';
import { isByteBufferEmpty } from '../util/isByteBufferEmpty';
import {
@@ -609,7 +610,11 @@ class MessageReceiverInner extends EventTarget {
envelopePlaintext = MessageReceiverInner.stringToArrayBufferBase64(
item.envelope
);
} else if (item.envelope && typeof item.envelope === 'string') {
} else if (typeof item.envelope === 'string') {
assert(
item.envelope || item.decrypted,
'MessageReceiver.queueCached: empty envelope without decrypted data'
);
envelopePlaintext = MessageReceiverInner.stringToArrayBuffer(
item.envelope
);
@@ -762,7 +767,7 @@ class MessageReceiverInner extends EventTarget {
const decrypted: Array<DecryptedEnvelope> = [];
try {
const lock = new Lock();
const lock = new Lock('cacheAndQueueBatch');
const sessionStore = new Sessions({
transactionOnly: true,
lock,