Fix PNI merging for PNI-only conversations
This commit is contained in:
parent
03f158a1a7
commit
4912e5a6da
1 changed files with 7 additions and 0 deletions
|
@ -720,6 +720,13 @@ export class ConversationController {
|
|||
const existing = byUuid[pni];
|
||||
if (!existing) {
|
||||
byUuid[pni] = conversation;
|
||||
} else if (existing === conversation) {
|
||||
// Conversation has both uuid and pni set to the same value. This
|
||||
// happens when starting a conversation by E164.
|
||||
assertDev(
|
||||
pni === uuid,
|
||||
'checkForConflicts: expected PNI to be equal to UUID'
|
||||
);
|
||||
} else {
|
||||
log.warn(`checkForConflicts: Found conflict with pni ${pni}`);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue