mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

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

2
js/views/conversation_view.js
View file

@ -2058,7 +2058,7 @@
await contact.setApproved();
}
message.resend(contact.get('uuid') || contact.get('e164'));
message.resend(contact.getSendTarget());
},
});

7
js/views/inbox_view.js
View file

@ -84,6 +84,13 @@
model: { window: options.window },
});
Whisper.events.on('refreshConversation', ({ oldId, newId }) => {
const convo = this.conversation_stack.lastConversation;
if (convo && convo.get('id') === oldId) {
this.conversation_stack.open(newId);
}
});
if (!options.initialLoadComplete) {
this.appLoadingScreen = new Whisper.AppLoadingScreen();
this.appLoadingScreen.render();