colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge contacts when we discover split or duplicated contacts

Browse Source
This commit is contained in:
Scott Nonnenberg
2020-07-10 11:28:49 -07:00
parent 68e432188b
commit 901179440f
32 changed files with 1199 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/modules/refresh_sender_certificate.js
View File

@@ -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();
}