1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-18 05:42:00 +03:00

Return device key list in a stable order, add a check for the list in the tests

This commit is contained in:
Mark Haines
2015-07-22 11:34:38 +01:00
parent 28a5719f5f
commit 319ca5123e
2 changed files with 24 additions and 10 deletions

View File

@@ -267,16 +267,23 @@ MatrixClient.prototype.listDeviceKeys = function(userId) {
var devices = this.sessionStore.getEndToEndDevicesForUser(userId);
var result = [];
if (devices) {
for (var deviceId in devices) {
var deviceId;
var deviceIds = [];
for (deviceId in devices) {
if (devices.hasOwnProperty(deviceId)) {
var device = devices[deviceId];
var ed25519Key = device.keys["ed25519:" + deviceId];
if (ed25519Key) {
result.push({
id: deviceId,
key: ed25519Key
});
}
deviceIds.push(deviceId);
}
}
deviceIds.sort();
for (var i = 0; i < deviceIds.length; ++i) {
deviceId = deviceIds[i];
var device = devices[deviceId];
var ed25519Key = device.keys["ed25519:" + deviceId];
if (ed25519Key) {
result.push({
id: deviceId,
key: ed25519Key
});
}
}
}