thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Populate registrationIds on deviceObjects

Browse source 
Saves us from doing so later.

// FREEBIE
This commit is contained in:
lilia 2015-11-17 11:56:45 -08:00
parent cf85c5e25e
commit adf8445b85
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
js/libtextsecure.js
View file

@ -35530,13 +35530,18 @@ axolotlInternal.RecipientRecord = function() {
deviceIds.push(deviceId); deviceIds.push(deviceId);
} }
} }
return deviceIds.map(function(deviceId) { return Promise.all(deviceIds.map(function(deviceId) {
var encodedNumber = number + '.' + deviceId; var encodedNumber = number + '.' + deviceId;
var deviceObject = tempKeys[encodedNumber] || {}; var deviceObject = tempKeys[encodedNumber] || {};
deviceObject.encodedNumber = encodedNumber; deviceObject.encodedNumber = encodedNumber;
deviceObject.identityKey = identityKey; deviceObject.identityKey = identityKey;
return deviceObject; return textsecure.protocol_wrapper.getRegistrationId(encodedNumber).then(function(registrationId) {
}); if (deviceObject.registrationId === undefined) {
deviceObject.registrationId = registrationId;
}
return deviceObject;
});
}));
}); });
}); });
}, },

11
libtextsecure/storage/devices.js
View file

@ -73,13 +73,18 @@
deviceIds.push(deviceId); deviceIds.push(deviceId);
} }
} }
return deviceIds.map(function(deviceId) { return Promise.all(deviceIds.map(function(deviceId) {
var encodedNumber = number + '.' + deviceId; var encodedNumber = number + '.' + deviceId;
var deviceObject = tempKeys[encodedNumber] || {}; var deviceObject = tempKeys[encodedNumber] || {};
deviceObject.encodedNumber = encodedNumber; deviceObject.encodedNumber = encodedNumber;
deviceObject.identityKey = identityKey; deviceObject.identityKey = identityKey;
return deviceObject; return textsecure.protocol_wrapper.getRegistrationId(encodedNumber).then(function(registrationId) {
}); if (deviceObject.registrationId === undefined) {
deviceObject.registrationId = registrationId;
}
return deviceObject;
});
}));
}); });
}); });
}, },