matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Merge pull request #159 from matrix-org/rav/device_name_for_e2e_keys

Browse Source 
client.listDeviceKeys: Expose device display name
This commit is contained in:
Richard van der Hoff
2016-08-03 14:32:02 +01:00
committed by GitHub
parent f139e6e6c2 bb946c65d1
commit c288e6c7ec
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/client.js
View File

@@ -489,6 +489,7 @@ function _updateStoredDeviceKeysForUser(userId, userStore, userResult) {
deviceStore.keys = deviceRes.keys; deviceStore.keys = deviceRes.keys;
deviceStore.algorithms = deviceRes.algorithms; deviceStore.algorithms = deviceRes.algorithms;
deviceStore.unsigned = deviceRes.unsigned;
updated = true; updated = true;
} }
@@ -500,8 +501,8 @@ function _updateStoredDeviceKeysForUser(userId, userStore, userResult) {
* *
* @param {string} userId the user to list keys for. * @param {string} userId the user to list keys for.
* *
* @return {object[]} list of devices with "id", "verified", "blocked", and * @return {object[]} list of devices with "id", "verified", "blocked",
* "key" parameters. * "key", and "display_name" parameters.
*/ */
MatrixClient.prototype.listDeviceKeys = function(userId) { MatrixClient.prototype.listDeviceKeys = function(userId) {
if (!this.sessionStore) { if (!this.sessionStore) {
@@ -522,12 +523,14 @@ MatrixClient.prototype.listDeviceKeys = function(userId) {
deviceId = deviceIds[i]; deviceId = deviceIds[i];
var device = devices[deviceId]; var device = devices[deviceId];
var ed25519Key = device.keys["ed25519:" + deviceId]; var ed25519Key = device.keys["ed25519:" + deviceId];
var unsigned = device.unsigned || {};
if (ed25519Key) { if (ed25519Key) {
result.push({ result.push({
id: deviceId, id: deviceId,
key: ed25519Key, key: ed25519Key,
verified: Boolean(device.verified == DeviceVerification.VERIFIED), verified: Boolean(device.verified == DeviceVerification.VERIFIED),
blocked: Boolean(device.verified == DeviceVerification.BLOCKED), blocked: Boolean(device.verified == DeviceVerification.BLOCKED),
display_name: unsigned.device_display_name,
}); });
} }
} }