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

Passive UUID support

Browse source 
Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
Ken Powers 2020-03-05 13:14:58 -08:00 • committed by Scott Nonnenberg
parent f64ca0ed21
commit a90246cbe5
49 changed files with 2226 additions and 776 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/modules/backup.js
View file

@ -1118,8 +1118,14 @@ async function importConversations(dir, options) {
function getMessageKey(message) {
const ourNumber = textsecure.storage.user.getNumber();
const ourUuid = textsecure.storage.user.getUuid();
const source = message.source || ourNumber;
if (source === ourNumber) {
const sourceUuid = message.sourceUuid || ourUuid;
if (
(source && source === ourNumber) ||
(sourceUuid && sourceUuid === ourUuid)
) {
return `${source} ${message.timestamp}`;
}