matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

Show UDDialog on m.call.invite failure

Browse Source 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/378

Also, refactored UDDialog creation into its own dispatch event, because there will be other parts of the code that will want to spawn one.
This commit is contained in:
Luke Barnard
2017-02-21 17:22:22 +00:00
parent 05d242cb5c
commit 878e31eba2
5 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/structures/MatrixChat.js
View File

@@ -518,6 +518,18 @@ module.exports = React.createClass({
case 'set_theme':
this._onSetTheme(payload.value);
break;
case 'unknown_device_error':
var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
Modal.createDialog(UnknownDeviceDialog, {
devices: payload.err.devices,
room: payload.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");
break;
case 'on_logged_in':
this._onLoggedIn();
break;

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

@@ -85,7 +85,7 @@ UnknownDeviceList.propTypes = {
export default React.createClass({
displayName: 'UnknownEventDialog',
displayName: 'UnknownDeviceDialog',
propTypes: {
room: React.PropTypes.object.isRequired,

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',