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

Factor out showing UnknownDeviceDialog

Browse source 
So we can re-use it for calls that fail due to unknwon devices
This commit is contained in:
David Baker 2017-11-15 15:14:42 +00:00
parent f8fc6dc83e
commit 93800be742
3 changed files with 46 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/structures/RoomStatusBar.js
View file

@ -23,8 +23,7 @@ import WhoIsTyping from '../../WhoIsTyping';
import MatrixClientPeg from '../../MatrixClientPeg';
import MemberAvatar from '../views/avatars/MemberAvatar';
import Resend from '../../Resend';
import Modal from '../../Modal';
import { getUnknownDevicesForRoom } from '../../cryptodevices';
import { getUnknownDevicesForRoom, showUnknownDeviceDialogForMessages } from '../../cryptodevices';
const HIDE_DEBOUNCE_MS = 10000;
const STATUS_BAR_HIDDEN = 0;
@ -158,15 +157,7 @@ module.exports = React.createClass({
},
_onShowDevicesClick: function() {
getUnknownDevicesForRoom(MatrixClientPeg.get(), this.props.room).then((unknownDevices) => {
if (this._unmounted) return;
const UnknownDeviceDialog = sdk.getComponent('dialogs.UnknownDeviceDialog');
Modal.createTrackedDialog('Unknown Device Dialog', '', UnknownDeviceDialog, {
room: this.props.room,
devices: unknownDevices,
}, 'mx_Dialog_unknownDevice');
});
showUnknownDeviceDialogForMessages(MatrixClientPeg.get(), this.props.room);
},
onRoomLocalEchoUpdated: function(event, room, oldEventId, oldStatus) {
@ -414,7 +405,6 @@ module.exports = React.createClass({
return null;
},
render: function() {
const content = this._getContent();
const indicator = this._getIndicator(this.state.usersTyping.length > 0);