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

MessageReceiver: Envelope id is always locally generated

Browse source
This commit is contained in:
Scott Nonnenberg 2021-01-06 10:10:39 -08:00
parent 4837014051
commit bc57a31e99
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ts/textsecure/MessageReceiver.ts
View file

@ -407,7 +407,7 @@ class MessageReceiverInner extends EventTarget {
// Make non-private envelope IDs dashless so they don't get redacted // Make non-private envelope IDs dashless so they don't get redacted
// from logs // from logs
envelope.id = (envelope.serverGuid || getGuid()).replace(/-/g, ''); envelope.id = getGuid().replace(/-/g, '');
envelope.serverTimestamp = envelope.serverTimestamp envelope.serverTimestamp = envelope.serverTimestamp
? envelope.serverTimestamp.toNumber() ? envelope.serverTimestamp.toNumber()
: null; : null;
@ -567,7 +567,7 @@ class MessageReceiverInner extends EventTarget {
const envelope = window.textsecure.protobuf.Envelope.decode( const envelope = window.textsecure.protobuf.Envelope.decode(
envelopePlaintext envelopePlaintext
); );
envelope.id = envelope.serverGuid || item.id; envelope.id = item.id;
envelope.source = envelope.source || item.source; envelope.source = envelope.source || item.source;
envelope.sourceUuid = envelope.sourceUuid || item.sourceUuid; envelope.sourceUuid = envelope.sourceUuid || item.sourceUuid;
envelope.sourceDevice = envelope.sourceDevice || item.sourceDevice; envelope.sourceDevice = envelope.sourceDevice || item.sourceDevice;