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

Merge pull request #721 from matrix-org/luke/fix-refactor-UnknownDeviceDialog

Browse source 
Show UDDialog on UDE during VoIP calls
This commit is contained in:
David Baker 2017-03-02 13:13:45 +00:00 • committed by GitHub
commit 95cff17698
7 changed files with 82 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@ limitations under the License.
import React from 'react';
import sdk from '../../../index';
import dis from '../../../dispatcher';
import MatrixClientPeg from '../../../MatrixClientPeg';
import GeminiScrollbar from 'react-gemini-scrollbar';
@ -85,7 +86,7 @@ UnknownDeviceList.propTypes = {
export default React.createClass({
displayName: 'UnknownEventDialog',
displayName: 'UnknownDeviceDialog',
propTypes: {
room: React.PropTypes.object.isRequired,
@ -125,14 +126,10 @@ export default React.createClass({
} else {
warning = (
<div>
<p>
This means there is no guarantee that the devices
belong to the users they claim to.
</p>
<p>
We recommend you go through the verification process
for each device before continuing, but you can resend
the message without verifying if you prefer.
for each device to confirm they belong to their legitimate owner,
but you can resend the message without verifying if you prefer.
</p>
</div>
);
@ -151,8 +148,7 @@ export default React.createClass({
>
<GeminiScrollbar autoshow={false} className="mx_Dialog_content">
<h4>
This room contains unknown devices which have not been
verified.
This room contains devices that you haven't seen before.
</h4>
{ warning }
Unknown devices:
@ -160,6 +156,13 @@ export default React.createClass({
<UnknownDeviceList devices={this.props.devices} />
</GeminiScrollbar>
<div className="mx_Dialog_buttons">
<button className="mx_Dialog_primary" autoFocus={ true }
onClick={() => {
this.props.onFinished();
Resend.resendUnsentEvents(this.props.room);
}}>
Send anyway
</button>
<button className="mx_Dialog_primary" autoFocus={ true }
onClick={() => {
// XXX: temporary logging to try to diagnose

13
src/components/views/rooms/MessageComposerInputOld.js
View file

@ -34,16 +34,11 @@ export function onSendMessageFailed(err, room) {
// https://github.com/vector-im/riot-web/issues/3148
console.log('MessageComposer got send failure: ' + err.name + '('+err+')');
if (err.name === "UnknownDeviceError") {
const UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
Modal.createDialog(UnknownDeviceDialog, {
devices: err.devices,
dis.dispatch({
action: 'unknown_device_error',
err: err,
room: room,
onFinished: (r) => {
// XXX: temporary logging to try to diagnose
// https://github.com/vector-im/riot-web/issues/3148
console.log('UnknownDeviceDialog closed with '+r);
},
}, "mx_Dialog_unknownDevice");
});
}
dis.dispatch({
action: 'message_send_failed',