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

Fix overriding undefined per-room unverified devices setting

Browse Source 
If the per-room setting for preventing sending keys to unverified
devices is `undefined`, it overrides the global setting (which
could be `true`).
This commit is contained in:
Luke Barnard
2018-02-22 18:02:39 +00:00
parent 856ef01632
commit 30cb6f196f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -543,7 +543,7 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
// The global value is treated as a default for when rooms don't specify a value. // The global value is treated as a default for when rooms don't specify a value.
let isBlacklisting = this._crypto.getGlobalBlacklistUnverifiedDevices(); let isBlacklisting = this._crypto.getGlobalBlacklistUnverifiedDevices();
if (room.getBlacklistUnverifiedDevices() !== null) { if (typeof room.getBlacklistUnverifiedDevices() === 'boolean') {
isBlacklisting = room.getBlacklistUnverifiedDevices(); isBlacklisting = room.getBlacklistUnverifiedDevices();
} }