matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

Fix lint

Browse Source
This commit is contained in:
Richard van der Hoff
2017-01-26 13:29:56 +00:00
parent c9b700ef6a
commit 85cf2a3692
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/crypto/algorithms/megolm.js
View File

@@ -473,8 +473,7 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
// common and then added new devices before joining this one? --Matthew // common and then added new devices before joining this one? --Matthew
// //
// yup, see https://github.com/vector-im/riot-web/issues/2305 --richvdh // yup, see https://github.com/vector-im/riot-web/issues/2305 --richvdh
var self = this; return this._crypto.downloadKeys(roomMembers, false).then((devices) => {
return self._crypto.downloadKeys(roomMembers, false).then(function(devices) {
// remove any blocked devices // remove any blocked devices
for (const userId in devices) { for (const userId in devices) {
if (!devices.hasOwnProperty(userId)) { if (!devices.hasOwnProperty(userId)) {
@@ -490,8 +489,8 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
if (userDevices[deviceId].isBlocked() || if (userDevices[deviceId].isBlocked() ||
(userDevices[deviceId].isUnverified() && (userDevices[deviceId].isUnverified() &&
(room.getBlacklistUnverifiedDevices() || (room.getBlacklistUnverifiedDevices() ||
self._crypto.getGlobalBlacklistUnverifiedDevices()))) this._crypto.getGlobalBlacklistUnverifiedDevices()))
{ ) {
delete userDevices[deviceId]; delete userDevices[deviceId];
} }
} }