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

Remove unsued argument from getDeviceObject

Browse source 
Last usage of the `returnIdentityKey` argument was removed in 8b9a16852.
This commit is contained in:
lilia 2015-04-20 14:17:04 -07:00
parent 5a46300581
commit 37e09da1cc
3 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
js/key_worker.js
View file

@ -38162,25 +38162,14 @@ window.axolotl.sessions = {
textsecure.storage.sessions._removeIdentityKeyForNumber(number); textsecure.storage.sessions._removeIdentityKeyForNumber(number);
}, },
getDeviceObject: function(encodedNumber, returnIdentityKey) { getDeviceObject: function(encodedNumber) {
var number = textsecure.utils.unencodeNumber(encodedNumber)[0]; var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
var devices = textsecure.storage.devices.getDeviceObjectsForNumber(number); var devices = textsecure.storage.devices.getDeviceObjectsForNumber(number);
if (devices.length == 0) {
if (returnIdentityKey) {
var identityKey = textsecure.storage.devices.getIdentityKeyForNumber(number);
if (identityKey !== undefined)
return {identityKey: identityKey};
}
return undefined;
}
for (var i in devices) for (var i in devices)
if (devices[i].encodedNumber == encodedNumber) if (devices[i].encodedNumber == encodedNumber)
return devices[i]; return devices[i];
if (returnIdentityKey)
return {identityKey: devices[0].identityKey};
return undefined; return undefined;
}, },

13
js/libtextsecure.js
View file

@ -38161,25 +38161,14 @@ window.axolotl.sessions = {
textsecure.storage.sessions._removeIdentityKeyForNumber(number); textsecure.storage.sessions._removeIdentityKeyForNumber(number);
}, },
getDeviceObject: function(encodedNumber, returnIdentityKey) { getDeviceObject: function(encodedNumber) {
var number = textsecure.utils.unencodeNumber(encodedNumber)[0]; var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
var devices = textsecure.storage.devices.getDeviceObjectsForNumber(number); var devices = textsecure.storage.devices.getDeviceObjectsForNumber(number);
if (devices.length == 0) {
if (returnIdentityKey) {
var identityKey = textsecure.storage.devices.getIdentityKeyForNumber(number);
if (identityKey !== undefined)
return {identityKey: identityKey};
}
return undefined;
}
for (var i in devices) for (var i in devices)
if (devices[i].encodedNumber == encodedNumber) if (devices[i].encodedNumber == encodedNumber)
return devices[i]; return devices[i];
if (returnIdentityKey)
return {identityKey: devices[0].identityKey};
return undefined; return undefined;
}, },

13
libtextsecure/storage/devices.js
View file

@ -131,25 +131,14 @@
textsecure.storage.sessions._removeIdentityKeyForNumber(number); textsecure.storage.sessions._removeIdentityKeyForNumber(number);
}, },
getDeviceObject: function(encodedNumber, returnIdentityKey) { getDeviceObject: function(encodedNumber) {
var number = textsecure.utils.unencodeNumber(encodedNumber)[0]; var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
var devices = textsecure.storage.devices.getDeviceObjectsForNumber(number); var devices = textsecure.storage.devices.getDeviceObjectsForNumber(number);
if (devices.length == 0) {
if (returnIdentityKey) {
var identityKey = textsecure.storage.devices.getIdentityKeyForNumber(number);
if (identityKey !== undefined)
return {identityKey: identityKey};
}
return undefined;
}
for (var i in devices) for (var i in devices)
if (devices[i].encodedNumber == encodedNumber) if (devices[i].encodedNumber == encodedNumber)
return devices[i]; return devices[i];
if (returnIdentityKey)
return {identityKey: devices[0].identityKey};
return undefined; return undefined;
}, },