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

Refactor and fixup key requests

Browse source 
Fix a bad loop scope bug in getKeysForNumber by using forEach.
Refactor the initial process of establishing key material for devices
that do not have open sessions.

// FREEBIE
This commit is contained in:
lilia 2015-11-03 16:13:19 -08:00
parent 6717390e83
commit a52d35bb1b
3 changed files with 52 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libtextsecure/storage/devices.js
View file

@ -40,16 +40,25 @@
delete tempKeys[encodedNumber];
return Promise.resolve();
},
needKeysForDevice: function(encodedNumber) {
if (tempKeys[encodedNumber] !== undefined) {
return Promise.resolve(false);
} else {
return textsecure.protocol_wrapper.hasOpenSession(encodedNumber).then(function(result) {
return !result;
});
}
},
getStaleDeviceIdsForNumber: function(number) {
return textsecure.storage.axolotl.getDeviceIds(number).then(function(deviceIds) {
if (deviceIds.length === 0) {
return [1];
}
var updateDevices = [];
return Promise.all(deviceIds.map(function(deviceId) {
var encodedNumber = number + '.' + deviceId;
return textsecure.protocol_wrapper.hasOpenSession(encodedNumber).then(function(hasSession) {
if (!hasSession && !tempKeys[encodedNumber]) {
updateDevices.push(deviceId);
}
});
})).then(function() {
return updateDevices;
});
});
},
getDeviceObjectsForNumber: function(number) {
return textsecure.storage.axolotl.getIdentityKey(number).then(function(identityKey) {
if (identityKey === undefined) {