Early preparations for PNP Contact Merging

2022-08-09 14:39:00 -07:00
parent 2f5dd73e58
commit faf6c41332
30 changed files with 1572 additions and 447 deletions
--- a/ts/textsecure/AccountManager.ts
+++ b/ts/textsecure/AccountManager.ts
@@ -615,10 +615,9 @@ export default class AccountManager extends EventTarget {
    // This needs to be done very early, because it changes how things are saved in the
    //   database. Your identity, for example, in the saveIdentityWithAttributes call
    //   below.
-    const conversationId = window.ConversationController.ensureContactIds({
+    const conversationId = window.ConversationController.maybeMergeContacts({
+      aci: ourUuid,
      e164: number,
-      uuid: ourUuid,
-      highTrust: true,
      reason: 'createAccount',
    });