matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-09 10:22:46 +03:00
Code Activity

actually consider _crypto.getGlobalBlacklistUnverifiedDevices

Browse Source
This commit is contained in:
Matthew Hodgson
2017-01-21 17:51:48 +00:00
parent 512d5882c9
commit d37935dd78
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -490,7 +490,8 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
if (userDevices[deviceId].isBlocked() ||
(userDevices[deviceId].isUnverified() &&
room.getBlacklistUnverifiedDevices()))
(room.getBlacklistUnverifiedDevices() ||
this._crypto.getGlobalBlacklistUnverifiedDevices())))
{
delete userDevices[deviceId];
}