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

resetSession: Take both UUID and e164, use each correctly

Browse Source
This commit is contained in:
Scott Nonnenberg
2020-06-08 13:22:26 -07:00
parent ae47748720
commit acf95f4745
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/models/conversations.js
View File

@@ -1727,7 +1727,8 @@
message.send(
this.wrapSend(
textsecure.messaging.resetSession(
this.get('uuid') || this.get('e164'),
this.get('uuid'),
this.get('e164'),
now,
options
)

8
js/signal_protocol_store.js
View File

@@ -583,9 +583,9 @@
nonblockingApproval = false;
}
const identifer = textsecure.utils.unencodeNumber(encodedAddress)[0];
const identityRecord = this.getIdentityRecord(identifer);
const id = ConversationController.getConversationId(identifer);
const identifier = textsecure.utils.unencodeNumber(encodedAddress)[0];
const identityRecord = this.getIdentityRecord(identifier);
const id = ConversationController.getConversationId(identifier);
if (!identityRecord || !identityRecord.publicKey) {
// Lookup failed, or the current key was removed, so save this one.
@@ -626,7 +626,7 @@
});
try {
this.trigger('keychange', identifer);
this.trigger('keychange', identifier);
} catch (error) {
window.log.error(
'saveIdentity error triggering keychange:',