matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Fix the tests

Browse Source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston
2017-11-05 14:56:41 -07:00
parent f0000f7400
commit 10519f9465
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/structures/MatrixChat.js
View File

@@ -1096,12 +1096,14 @@ module.exports = React.createClass({
krh.handleKeyRequestCancellation(req);
});
cli.on("Room", (room) => {
const blacklistEnabled = SettingsStore.getValueAt(
SettingLevel.ROOM_DEVICE,
"blacklistUnverifiedDevices",
room.roomId,
);
room.setBlacklistUnverifiedDevices(blacklistEnabled);
if (MatrixClientPeg.get().isCryptoEnabled()) {
const blacklistEnabled = SettingsStore.getValueAt(
SettingLevel.ROOM_DEVICE,
"blacklistUnverifiedDevices",
room.roomId,
);
room.setBlacklistUnverifiedDevices(blacklistEnabled);
}
});
},
@@ -1113,11 +1115,13 @@ module.exports = React.createClass({
_onClientStarted: function() {
const cli = MatrixClientPeg.get();
const blacklistEnabled = SettingsStore.getValueAt(
SettingLevel.DEVICE,
"blacklistUnverifiedDevices"
);
cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
if (cli.isCryptoEnabled()) {
const blacklistEnabled = SettingsStore.getValueAt(
SettingLevel.DEVICE,
"blacklistUnverifiedDevices"
);
cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
}
},
showScreen: function(screen, params) {