imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make blacklistUnverifiedDevices override the level order

Browse source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-11-08 17:41:32 -07:00
parent c7d8f3931f
commit f7da5836e1
5 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/dialogs/UnknownDeviceDialog.js
View file

@ -147,9 +147,12 @@ export default React.createClass({
return <Spinner />;
}
// The global value is treated as a default for when rooms don't specify a value.
const client = MatrixClientPeg.get();
const blacklistUnverified = client.getGlobalBlacklistUnverifiedDevices() ||
this.props.room.getBlacklistUnverifiedDevices();
let blacklistUnverified = client.getGlobalBlacklistUnverifiedDevices();
if (this.props.room.getBlacklistUnverifiedDevices() !== null) {
blacklistUnverified = this.props.room.getBlacklistUnverifiedDevices();
}
let warning;
if (blacklistUnverified) {