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

make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020

Browse source
This commit is contained in:
Matthew Hodgson 2017-01-22 01:28:43 +01:00
parent d9c0513ee2
commit 7bc3fc8696
6 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,14 +36,15 @@ module.exports = React.createClass({
},
render: function() {
var DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
var client = MatrixClientPeg.get();
var blacklistUnverified = (client.getGlobalBlacklistUnverifiedDevices() || room.getBlacklistUnverifiedDevices());
var blacklistUnverified = client.getGlobalBlacklistUnverifiedDevices() || this.props.room.getBlacklistUnverifiedDevices();
var warning;
if (blacklistUnverified) {
warning = <h4>You are currently blacklisting unverified devices; to send messages to these devices you must verify them.<h4>;
warning = <h4>You are currently blacklisting unverified devices; to send messages to these devices you must verify them.</h4>
}
else {
warning = <h4>We strongly recommend you verify them before continuing.</h4>;
warning = <h4>We strongly recommend you verify them before continuing.</h4>
}
return (
@ -54,27 +55,27 @@ module.exports = React.createClass({
<div className="mx_Dialog_content">
<h4>This room contains unknown devices which have not been verified.</h4>
{ warning }
<p>Unknown devices:
<ul>{
Object.keys(this.props.devices).map(userId=>{
return <li key={ userId }>
<p>{ userId }:</p>
<ul>
{
Object.keys(this.props.devices[userId]).map(deviceId=>{
var DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
var device = this.props.devices[userId][deviceId];
var buttons = <DeviceVerifyButtons device={ device } userId={ userId } />
return <li key={ deviceId }>
{ deviceId } ( { device.getDisplayName() } ) { buttons }
</li>
})
}
</ul>
</li>
})
}</ul>
</p>
Unknown devices:
<ul>{
Object.keys(this.props.devices).map(userId=>{
return <li key={ userId }>
<p>{ userId }:</p>
<ul className="mx_UnknownDeviceDialog_deviceList">
{
Object.keys(this.props.devices[userId]).map(deviceId=>{
var device = this.props.devices[userId][deviceId];
var buttons = <DeviceVerifyButtons device={ device } userId={ userId } />
return <li key={ deviceId }>
{ buttons }
{ deviceId }<br/>
{ device.getDisplayName() }
</li>
})
}
</ul>
</li>
})
}</ul>
</div>
<div className="mx_Dialog_buttons">
<button className="mx_Dialog_primary" onClick={ this.props.onFinished } autoFocus={ true }>