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

Include DeviceInfo in deviceVerificationChanged events

Browse Source 
... to help the UI update itself
This commit is contained in:
Richard van der Hoff
2017-02-03 14:27:08 +00:00
parent bd4de4832c
commit a3cc8eb1f6
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/crypto/index.js
View File

@@ -386,6 +386,8 @@ Crypto.prototype.listDeviceKeys = function(userId) {
*
* @param {?boolean} known whether to mark that the user has been made aware of
* the existence of this device. Null to leave unchanged
*
* @return {module:crypto/deviceinfo} updated DeviceInfo
*/
Crypto.prototype.setDeviceVerification = function(userId, deviceId, verified,
blocked, known) {
@@ -414,12 +416,12 @@ Crypto.prototype.setDeviceVerification = function(userId, deviceId, verified,
knownStatus = known;
}
if (dev.verified === verificationStatus && dev.known === knownStatus) {
return;
if (dev.verified !== verificationStatus || dev.known !== knownStatus) {
dev.verified = verificationStatus;
dev.known = knownStatus;
this._sessionStore.storeEndToEndDevicesForUser(userId, devices);
}
dev.verified = verificationStatus;
dev.known = knownStatus;
this._sessionStore.storeEndToEndDevicesForUser(userId, devices);
return DeviceInfo.fromStorage(dev, deviceId);
};