Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-02-15 07:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Streamline logic in maybeMergeContacts

Browse Source 
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
automated-signal
2024-08-06 11:49:10 -05:00
committed by GitHub
parent f1852deff8
commit 8d9a0959c2
1 changed files with 14 additions and 6 deletions
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}`);