Merge contacts when we discover split or duplicated contacts

js/modules/refresh_sender_certificate.js

@@ -15,15 +15,8 @@ let scheduleNext = null;
 //   do not support unidentified delivery.
 function refreshOurProfile() {
   window.log.info('refreshOurProfile');
-  const ourNumber = textsecure.storage.user.getNumber();
-  const ourUuid = textsecure.storage.user.getUuid();
-  const ourId = ConversationController.ensureContactIds({
-    e164: ourNumber,
-    uuid: ourUuid,
-  });
-  const conversation = ConversationController.get(ourId, 'private');
-  conversation.updateUuid(ourUuid);
-  conversation.updateE164(ourNumber);
+  const ourId = ConversationController.getOurConversationId();
+  const conversation = ConversationController.get(ourId);
   conversation.getProfiles();
 }
 

js/modules/signal.js

@@ -3,6 +3,9 @@
 const { bindActionCreators } = require('redux');
 const Backbone = require('../../ts/backbone');
 const Crypto = require('../../ts/Crypto');
+const {
+  start: conversationControllerStart,
+} = require('../../ts/ConversationController');
 const Data = require('../../ts/sql/Client').default;
 const Emojis = require('./emojis');
 const EmojiLib = require('../../ts/components/emoji/lib');
@@ -357,6 +360,7 @@ exports.setup = (options = {}) => {
     Backbone,
     Components,
     Crypto,
+    conversationControllerStart,
     Data,
     Emojis,
     EmojiLib,