OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

improve the verify warning if blacklisting is unabled

pull/21833/head
Matthew Hodgson 2017-01-21 17:56:48 +00:00
parent c618880af9
commit 071e364be2
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Resend.js
View File

@ -32,7 +32,8 @@ module.exports = {
if (err.name === "UnknownDeviceError") {
var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
Modal.createDialog(UnknownDeviceDialog, {
devices: err.devices
devices: err.devices,
room: MatrixClientPeg.get().getRoom(event.getRoomId()),
});
}

12
src/components/views/dialogs/UnknownDeviceDialog.js
View File

@ -22,6 +22,7 @@ module.exports = React.createClass({
displayName: 'UnknownEventDialog',
propTypes: {
room: React.PropTypes.object.isRequired,
devices: React.PropTypes.object.isRequired,
onFinished: React.PropTypes.func.isRequired,
},
@ -35,6 +36,15 @@ module.exports = React.createClass({
},
render: function() {
var client = MatrixClientPeg.get();
var warning;
if (client.getGlobalBlacklistUnverifiedDevices() || room.getBlacklistUnverifiedDevices()) {
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>;
}
return (
<div className="mx_UnknownDeviceDialog" onKeyDown={ this.onKeyDown }>
<div className="mx_Dialog_title">
@ -42,7 +52,7 @@ module.exports = React.createClass({
</div>
<div className="mx_Dialog_content">
<h4>This room contains unknown devices which have not been verified.</h4>
<h4>We strongly recommend you verify them before continuing.</h4>
{ warning }
<p>Unknown devices:
<ul>{
Object.keys(this.props.devices).map(userId=>{

3
src/components/views/rooms/MessageComposerInput.js
View File

@ -561,7 +561,8 @@ export default class MessageComposerInput extends React.Component {
if (err.name === "UnknownDeviceError") {
var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
Modal.createDialog(UnknownDeviceDialog, {
devices: err.devices
devices: err.devices,
room: this.props.room,
});
}
dis.dispatch({

3
src/components/views/rooms/MessageComposerInputOld.js
View File

@ -345,7 +345,8 @@ module.exports = React.createClass({
if (err.name === "UnknownDeviceError") {
var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
Modal.createDialog(UnknownDeviceDialog, {
devices: err.devices
devices: err.devices,
room: this.props.room,
});
}