From 2711da28b4c3e009b094cea64a237671b181fd70 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 8 Nov 2017 17:43:06 -0700 Subject: [PATCH] Use the SettingsStore in the UnknownDeviceDialog --- src/components/views/dialogs/UnknownDeviceDialog.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js index 13c92cecc9..09c4cc2411 100644 --- a/src/components/views/dialogs/UnknownDeviceDialog.js +++ b/src/components/views/dialogs/UnknownDeviceDialog.js @@ -20,6 +20,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg'; import GeminiScrollbar from 'react-gemini-scrollbar'; import Resend from '../../../Resend'; import { _t } from '../../../languageHandler'; +import SettingsStore from "../../../settings/SettingsStore"; function DeviceListEntry(props) { const {userId, device} = props; @@ -147,15 +148,8 @@ export default React.createClass({ return ; } - // The global value is treated as a default for when rooms don't specify a value. - const client = MatrixClientPeg.get(); - let blacklistUnverified = client.getGlobalBlacklistUnverifiedDevices(); - if (this.props.room.getBlacklistUnverifiedDevices() !== null) { - blacklistUnverified = this.props.room.getBlacklistUnverifiedDevices(); - } - let warning; - if (blacklistUnverified) { + if (SettingsStore.getValue("blacklistUnverifiedDevices", this.props.room.roomId)) { warning = (

{ _t("You are currently blacklisting unverified devices; to send " +