Merge pull request #616 from matrix-org/luke/fix-unverified-device-bl…

…acklist

Fix bug where global "Never send to unverified..." is ignored

src/crypto/algorithms/megolm.js

@@ -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.
     let isBlacklisting = this._crypto.getGlobalBlacklistUnverifiedDevices();
-    if (room.getBlacklistUnverifiedDevices() !== null) {
+    if (typeof room.getBlacklistUnverifiedDevices() === 'boolean') {
         isBlacklisting = room.getBlacklistUnverifiedDevices();
     }