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

Move UDE handling to a its own file, adjust wording

Browse Source
This commit is contained in:
Luke Barnard
2017-02-22 16:42:14 +00:00
parent 816e0be3a0
commit 436e6b36f1
3 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ var Lifecycle = require('../../Lifecycle');
var PageTypes = require('../../PageTypes');
var createRoom = require("../../createRoom");
var UDEHandler = require("../../UnknownDeviceErrorHandler");
module.exports = React.createClass({
displayName: 'MatrixChat',
@@ -240,6 +241,7 @@ module.exports = React.createClass({
componentDidMount: function() {
this.dispatcherRef = dis.register(this.onAction);
UDEHandler.startListening();
this.focusComposer = false;
window.addEventListener("focus", this.onFocus);
@@ -286,6 +288,7 @@ module.exports = React.createClass({
componentWillUnmount: function() {
Lifecycle.stopMatrixClient();
dis.unregister(this.dispatcherRef);
UDEHandler.stopListening();
window.removeEventListener("focus", this.onFocus);
window.removeEventListener('resize', this.handleResize);
},
@@ -519,18 +522,6 @@ 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 'resend_all_events':
payload.room.getPendingEvents().filter(function(ev) {
return ev.status === Matrix.EventStatus.NOT_SENT;

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

@@ -132,7 +132,7 @@ export default React.createClass({
</p>
<p>
We recommend you go through the verification process
for each device before continuing, but you can retry
for each device before continuing, but you can send
without verifying if you prefer.
</p>
</div>