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

Streamline logic in maybeMergeContacts

Browse source
This commit is contained in:
Fedor Indutny 2024-08-05 13:40:33 -07:00 committed by GitHub
parent 0350f98f98
commit c4541516b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ts/ConversationController.ts
View file

@ -492,12 +492,20 @@ export class ConversationController {
const dataProvided = [];
if (providedAci) {
dataProvided.push(`aci=${providedAci}`);
}
if (e164) {
dataProvided.push(`e164=${e164}`);
}
if (providedPni) {
dataProvided.push(`pni=${providedPni}`);
if (e164) {
dataProvided.push('e164');
}
if (providedPni) {
dataProvided.push('pni');
}
} else {
if (e164) {
dataProvided.push(`e164=${e164}`);
}
if (providedPni) {
dataProvided.push(`pni=${providedPni}`);
}
}
if (fromPniSignature) {
dataProvided.push(`fromPniSignature=${fromPniSignature}`);