Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-26 21:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Notifications for a few merge-related scenarios

Browse Source
This commit is contained in:
Scott Nonnenberg
2022-12-05 14:46:54 -08:00
committed by GitHub
parent 78ce34b9d3
commit a49a6f2057
40 changed files with 2764 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ts/textsecure/AccountManager.ts
View File

@@ -620,15 +620,15 @@ 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.maybeMergeContacts({
const { conversation } = window.ConversationController.maybeMergeContacts({
aci: ourUuid,
pni: ourPni,
e164: number,
reason: 'createAccount',
});
if (!conversationId) {
throw new Error('registrationDone: no conversationId!');
if (!conversation) {
throw new Error('registrationDone: no conversation!');
}
const identityAttrs = {