colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

6
ts/textsecure/MessageReceiver.ts
View File

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