mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-25 02:35:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use the SettingsStore in the UnknownDeviceDialog

Browse source
This commit is contained in:
Travis Ralston 2017-11-08 17:43:06 -07:00
parent f7da5836e1
commit 2711da28b4
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 <Spinner />;
}
// 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 = (
<h4>
{ _t("You are currently blacklisting unverified devices; to send " +