+ { roomStores.map((roomStore, i) => {
+ if (roomStore) {
+ const isActive = roomStore === this.state.activeRoomStore;
+ const tileClasses = classNames({
+ "mx_GroupGridView_tile": true,
+ "mx_GroupGridView_activeTile": isActive,
+ });
+ return ( {this._setActive(i);}}
+ key={roomStore.getRoomId()}
+ className={tileClasses}
+ >
+ );
+ } else {
+ return ({_t("No room in this tile yet.")} );
+ }
+ }) }
+
+ {_t("Backup created")}
-{_t("Your encryption keys are now being backed up to your Homeserver.")}
+{_t( + "Your encryption keys are now being backed up in the background " + + "to your Homeserver. The initial backup could take several minutes. " + + "You can view key backup upload progress in Settings.")}
{content}
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index e88e0444bc..c97ce58c07 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -32,7 +32,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
dis.dispatch({ action: 'view_user_settings' });
}
- onSetupClick = async() => {
+ onSetupClick = async () => {
// TODO: Should change to a restore key backup flow that checks the
// recovery passphrase while at the same time also cross-signing the
// device as well in a single flow. Since we don't have that yet, we'll
@@ -79,7 +79,6 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
+
+
+ );
+ }
+}
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 937e07d31e..834fcd2340 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -781,7 +781,7 @@ export default React.createClass({
),
button: _t("Leave"),
danger: this.state.isUserPrivileged,
- onFinished: async(confirmed) => {
+ onFinished: async (confirmed) => {
if (!confirmed) return;
this.setState({membershipBusy: true});
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 0433ce25b3..67d7d41701 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -31,6 +31,7 @@ import sessionStore from '../../stores/SessionStore';
import MatrixClientPeg from '../../MatrixClientPeg';
import SettingsStore from "../../settings/SettingsStore";
import RoomListStore from "../../stores/RoomListStore";
+import OpenRoomsStore from "../../stores/OpenRoomsStore";
import TagOrderActions from '../../actions/TagOrderActions';
import RoomListActions from '../../actions/RoomListActions';
@@ -416,6 +417,7 @@ const LoggedInView = React.createClass({
const RoomDirectory = sdk.getComponent('structures.RoomDirectory');
const HomePage = sdk.getComponent('structures.HomePage');
const GroupView = sdk.getComponent('structures.GroupView');
+ const GroupGridView = sdk.getComponent('structures.GroupGridView');
const MyGroups = sdk.getComponent('structures.MyGroups');
const MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
const CookieBar = sdk.getComponent('globals.CookieBar');
@@ -428,7 +430,14 @@ const LoggedInView = React.createClass({
switch (this.props.page_type) {
case PageTypes.RoomView:
+ if (!OpenRoomsStore.getActiveRoomStore()) {
+ console.warn(`LoggedInView: getCurrentRoomStore not set!`);
+ }
+ else if (OpenRoomsStore.getActiveRoomStore().getRoomId() !== this.props.currentRoomId) {
+ console.warn(`LoggedInView: room id in store not the same as in props: ${OpenRoomsStore.getActiveRoomStore().getRoomId()} & ${this.props.currentRoomId}`);
+ }
page_element = {
- dis.dispatch({action: 'start_registration'});
+ this.props.roomViewStore.getDispatcher().dispatch({action: 'start_registration'});
close();
},
onLoginClick: (ev) => {
- dis.dispatch({action: 'start_login'});
+ this.props.roomViewStore.getDispatcher().dispatch({action: 'start_login'});
close();
},
}).close;
@@ -929,7 +921,7 @@ module.exports = React.createClass({
Promise.resolve().then(() => {
const signUrl = this.props.thirdPartyInvite ?
this.props.thirdPartyInvite.inviteSignUrl : undefined;
- dis.dispatch({
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'join_room',
opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
});
@@ -994,10 +986,10 @@ module.exports = React.createClass({
},
uploadFile: async function(file) {
- dis.dispatch({action: 'focus_composer'});
+ this.props.roomViewStore.getDispatcher().dispatch({action: 'focus_composer'});
if (MatrixClientPeg.get().isGuest()) {
- dis.dispatch({action: 'require_registration'});
+ this.props.roomViewStore.getDispatcher().dispatch({action: 'require_registration'});
return;
}
@@ -1021,14 +1013,14 @@ module.exports = React.createClass({
}
// Send message_sent callback, for things like _checkIfAlone because after all a file is still a message.
- dis.dispatch({
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'message_sent',
});
},
injectSticker: function(url, info, text) {
if (MatrixClientPeg.get().isGuest()) {
- dis.dispatch({action: 'require_registration'});
+ this.props.roomViewStore.getDispatcher().dispatch({action: 'require_registration'});
return;
}
@@ -1229,7 +1221,7 @@ module.exports = React.createClass({
},
onSettingsClick: function() {
- dis.dispatch({ action: 'open_room_settings' });
+ this.props.roomViewStore.getDispatcher().dispatch({ action: 'open_room_settings' });
},
onSettingsSaveClick: function() {
@@ -1262,31 +1254,31 @@ module.exports = React.createClass({
});
// still editing room settings
} else {
- dis.dispatch({ action: 'close_settings' });
+ this.props.roomViewStore.getDispatcher().dispatch({ action: 'close_settings' });
}
}).finally(() => {
this.setState({
uploadingRoomSettings: false,
});
- dis.dispatch({ action: 'close_settings' });
+ this.props.roomViewStore.getDispatcher().dispatch({ action: 'close_settings' });
}).done();
},
onCancelClick: function() {
console.log("updateTint from onCancelClick");
this.updateTint();
- dis.dispatch({ action: 'close_settings' });
+ this.props.roomViewStore.getDispatcher().dispatch({ action: 'close_settings' });
if (this.state.forwardingEvent) {
- dis.dispatch({
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'forward_event',
event: null,
});
}
- dis.dispatch({action: 'focus_composer'});
+ this.props.roomViewStore.getDispatcher().dispatch({action: 'focus_composer'});
},
onLeaveClick: function() {
- dis.dispatch({
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'leave_room',
room_id: this.state.room.roomId,
});
@@ -1294,7 +1286,7 @@ module.exports = React.createClass({
onForgetClick: function() {
MatrixClientPeg.get().forget(this.state.room.roomId).done(function() {
- dis.dispatch({ action: 'view_next_room' });
+ this.props.roomViewStore.getDispatcher().dispatch({ action: 'view_next_room' });
}, function(err) {
const errCode = err.errcode || _t("unknown error code");
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@@ -1311,7 +1303,7 @@ module.exports = React.createClass({
rejecting: true,
});
MatrixClientPeg.get().leave(this.state.roomId).done(function() {
- dis.dispatch({ action: 'view_next_room' });
+ this.props.roomViewStore.getDispatcher().dispatch({ action: 'view_next_room' });
self.setState({
rejecting: false,
});
@@ -1337,7 +1329,7 @@ module.exports = React.createClass({
// using /leave rather than /join. In the short term though, we
// just ignore them.
// https://github.com/vector-im/vector-web/issues/1134
- dis.dispatch({
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'view_room_directory',
});
},
@@ -1356,7 +1348,7 @@ module.exports = React.createClass({
// jump down to the bottom of this room, where new events are arriving
jumpToLiveTimeline: function() {
this.refs.messagePanel.jumpToLiveTimeline();
- dis.dispatch({action: 'focus_composer'});
+ this.props.roomViewStore.getDispatcher().dispatch({action: 'focus_composer'});
},
// jump up to wherever our read marker is
@@ -1446,7 +1438,7 @@ module.exports = React.createClass({
},
onFullscreenClick: function() {
- dis.dispatch({
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'video_fullscreen',
fullscreen: true,
}, true);
@@ -1571,6 +1563,7 @@ module.exports = React.createClass({
{_t( diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.js index b85c09b320..d164fab46a 100644 --- a/src/autocomplete/CommunityProvider.js +++ b/src/autocomplete/CommunityProvider.js @@ -61,7 +61,7 @@ export default class CommunityProvider extends AutocompleteProvider { if (command) { const joinedGroups = cli.getGroups().filter(({myMembership}) => myMembership === 'join'); - const groups = (await Promise.all(joinedGroups.map(async({groupId}) => { + const groups = (await Promise.all(joinedGroups.map(async ({groupId}) => { try { return FlairStore.getGroupProfileCached(cli, groupId); } catch (e) { // if FlairStore failed, fall back to just groupId diff --git a/src/components/structures/GroupGridView.js b/src/components/structures/GroupGridView.js new file mode 100644 index 0000000000..a1a9e1b183 --- /dev/null +++ b/src/components/structures/GroupGridView.js @@ -0,0 +1,127 @@ +/* +Copyright 2017 Vector Creations Ltd. +Copyright 2017, 2018 New Vector Ltd. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import React from 'react'; +import OpenRoomsStore from '../../stores/OpenRoomsStore'; +import dis from '../../dispatcher'; +import {_t} from '../../languageHandler'; +import RoomView from './RoomView'; +import classNames from 'classnames'; +import MainSplit from './MainSplit'; +import RightPanel from './RightPanel'; +import RoomHeaderButtons from '../views/right_panel/RoomHeaderButtons'; + +export default class RoomGridView extends React.Component { + constructor(props) { + super(props); + this.state = { + roomStores: OpenRoomsStore.getRoomStores(), + activeRoomStore: OpenRoomsStore.getActiveRoomStore(), + }; + this.onRoomsChanged = this.onRoomsChanged.bind(this); + } + + componentDidUpdate(_, prevState) { + const store = this.state.activeRoomStore; + if (store) { + store.getDispatcher().dispatch({action: 'focus_composer'}); + } + } + + componentDidMount() { + this.componentDidUpdate(); + } + + componentWillMount() { + this._unmounted = false; + this._openRoomsStoreRegistration = OpenRoomsStore.addListener(this.onRoomsChanged); + } + + componentWillUnmount() { + this._unmounted = true; + if (this._openRoomsStoreRegistration) { + this._openRoomsStoreRegistration.remove(); + } + } + + onRoomsChanged() { + if (this._unmounted) return; + this.setState({ + roomStores: OpenRoomsStore.getRoomStores(), + activeRoomStore: OpenRoomsStore.getActiveRoomStore(), + }); + } + + _setActive(i) { + const store = OpenRoomsStore.getRoomStoreAt(i); + if (store !== this.state.activeRoomStore) { + dis.dispatch({ + action: 'group_grid_set_active', + room_id: store.getRoomId(), + }); + } + } + + render() { + let roomStores = this.state.roomStores.slice(0, 6); + const emptyCount = 6 - roomStores.length; + if (emptyCount) { + const emptyTiles = Array.from({length: emptyCount}, () => null); + roomStores = roomStores.concat(emptyTiles); + } + const activeRoomId = this.state.activeRoomStore && this.state.activeRoomStore.getRoomId(); + let rightPanel; + if (activeRoomId) { + rightPanel = ( +
+
+ );
+ }
+
+ return (
@@ -1617,6 +1610,7 @@ module.exports = React.createClass({
{
// TODO: this ought to be a separate component so that we don't need
// to rebind the onChange each time we render
- const onChange = async(e) => {
+ const onChange = async (e) => {
const checked = e.target.checked;
if (featureId === "feature_lazyloading") {
const confirmed = await this._onLazyLoadChanging(checked);
diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
index 2dd611843a..e30acca16d 100644
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -48,7 +48,7 @@ export default class GroupInviteTileContextMenu extends React.Component {
Modal.createTrackedDialog('Reject community invite', '', QuestionDialog, {
title: _t('Reject invitation'),
description: _t('Are you sure you want to reject the invitation?'),
- onFinished: async(shouldLeave) => {
+ onFinished: async (shouldLeave) => {
if (!shouldLeave) return;
// FIXME: controller shouldn't be loading a view :(
diff --git a/src/components/views/context_menus/StatusMessageContextMenu.js b/src/components/views/context_menus/StatusMessageContextMenu.js
index f07220db44..d062fc2a3e 100644
--- a/src/components/views/context_menus/StatusMessageContextMenu.js
+++ b/src/components/views/context_menus/StatusMessageContextMenu.js
@@ -35,7 +35,7 @@ export default class StatusMessageContextMenu extends React.Component {
};
}
- _onClearClick = async(e) => {
+ _onClearClick = async (e) => {
await MatrixClientPeg.get()._unstable_setStatusMessage("");
this.setState({message: ""});
};
diff --git a/src/components/views/context_menus/TagTileContextMenu.js b/src/components/views/context_menus/TagTileContextMenu.js
index 32f5365b82..8ce09bdb2c 100644
--- a/src/components/views/context_menus/TagTileContextMenu.js
+++ b/src/components/views/context_menus/TagTileContextMenu.js
@@ -21,6 +21,7 @@ import dis from '../../../dispatcher';
import TagOrderActions from '../../../actions/TagOrderActions';
import MatrixClientPeg from '../../../MatrixClientPeg';
import sdk from '../../../index';
+import SettingsStore from "../../../settings/SettingsStore";
export default class TagTileContextMenu extends React.Component {
static propTypes = {
@@ -34,6 +35,7 @@ export default class TagTileContextMenu extends React.Component {
this._onViewCommunityClick = this._onViewCommunityClick.bind(this);
this._onRemoveClick = this._onRemoveClick.bind(this);
+ this._onViewAsGridClick = this._onViewAsGridClick.bind(this);
}
_onViewCommunityClick() {
@@ -53,8 +55,28 @@ export default class TagTileContextMenu extends React.Component {
this.props.onFinished();
}
+ _onViewAsGridClick() {
+ dis.dispatch({
+ action: 'group_grid_view',
+ group_id: this.props.tag,
+ });
+ this.props.onFinished();
+ }
+
render() {
const TintableSvg = sdk.getComponent("elements.TintableSvg");
+ let gridViewOption;
+ if (SettingsStore.isFeatureEnabled("feature_gridview")) {
+ gridViewOption = (
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index 3c4872188a..8c74b3aff5 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -1,5 +1,5 @@
/*
-Copyright 2018 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,48 +15,150 @@ limitations under the License.
*/
import React from 'react';
-import QuestionDialog from './QuestionDialog';
import Modal from '../../../Modal';
+import sdk from '../../../index';
import dis from '../../../dispatcher';
import { _t } from '../../../languageHandler';
import MatrixClientPeg from '../../../MatrixClientPeg';
+import SettingsStore from "../../../settings/SettingsStore";
-export default (props) => {
- const description = _t("For security, logging out will delete any end-to-end " +
- "encryption keys from this browser. If you want to be able " +
- "to decrypt your conversation history from future Riot sessions, " +
- "please export your room keys for safe-keeping.");
+export default class LogoutDialog extends React.Component {
+ constructor() {
+ super();
+ this._onSettingsLinkClick = this._onSettingsLinkClick.bind(this);
+ this._onExportE2eKeysClicked = this._onExportE2eKeysClicked.bind(this);
+ this._onFinished = this._onFinished.bind(this);
+ this._onSetRecoveryMethodClick = this._onSetRecoveryMethodClick.bind(this);
+ this._onLogoutConfirm = this._onLogoutConfirm.bind(this);
+ }
- const onExportE2eKeysClicked = () => {
+ _onSettingsLinkClick() {
+ // close dialog
+ if (this.props.onFinished) {
+ this.props.onFinished();
+ }
+ }
+
+ _onExportE2eKeysClicked() {
Modal.createTrackedDialogAsync('Export E2E Keys', '',
import('../../../async-components/views/dialogs/ExportE2eKeysDialog'),
{
matrixClient: MatrixClientPeg.get(),
},
);
- };
+ }
- const onFinished = (confirmed) => {
+ _onFinished(confirmed) {
if (confirmed) {
dis.dispatch({action: 'logout'});
}
// close dialog
- if (props.onFinished) {
- props.onFinished();
+ if (this.props.onFinished) {
+ this.props.onFinished();
}
- };
+ }
- return ({description} }
- button={_t("Sign out")}
- extraButtons={[
- (),
- ]}
- onFinished={onFinished}
- />);
-};
+ _onSetRecoveryMethodClick() {
+ Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
+ import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
+ );
+
+ // close dialog
+ if (this.props.onFinished) {
+ this.props.onFinished();
+ }
+ }
+
+ _onLogoutConfirm() {
+ dis.dispatch({action: 'logout'});
+
+ // close dialog
+ if (this.props.onFinished) {
+ this.props.onFinished();
+ }
+ }
+
+ render() {
+ let description;
+ if (SettingsStore.isFeatureEnabled("feature_keybackup")) {
+ description =
+
+
+
+ );
+ } else {
+ const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
+ return (
+ { _t("Export E2E room keys") }
+ ),
+ ]}
+ onFinished={this._onFinished}
+ />);
+ }
+ }
+}
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 0d0949f07c..9d9e5a9e79 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -271,7 +271,7 @@ const Pill = React.createClass({
break;
}
- const classes = classNames(pillClass, {
+ const classes = classNames("mx_Pill", pillClass, {
"mx_UserPill_me": userId === MatrixClientPeg.get().credentials.userId,
"mx_UserPill_selected": this.props.isSelected,
});
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index f0479eb8be..3f5f58121d 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -78,7 +78,6 @@ export default class HeaderButtons extends React.Component {
// till show_right_panel, just without the fromHeader flag
// as that would hide the right panel again
dis.dispatch(Object.assign({}, payload, {fromHeader: false}));
-
}
this.setState({
phase: payload.phase,
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 12dc2117a0..2b50ff5e48 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -39,7 +39,6 @@ import Unread from '../../../Unread';
import { findReadReceiptFromUserId } from '../../../utils/Receipt';
import withMatrixClient from '../../../wrappers/withMatrixClient';
import AccessibleButton from '../elements/AccessibleButton';
-import RoomViewStore from '../../../stores/RoomViewStore';
import SdkConfig from '../../../SdkConfig';
import MultiInviter from "../../../utils/MultiInviter";
import SettingsStore from "../../../settings/SettingsStore";
@@ -50,6 +49,7 @@ module.exports = withMatrixClient(React.createClass({
propTypes: {
matrixClient: PropTypes.object.isRequired,
member: PropTypes.object.isRequired,
+ roomId: PropTypes.string,
},
getInitialState: function() {
@@ -713,8 +713,8 @@ module.exports = withMatrixClient(React.createClass({
}
if (!member || !member.membership || member.membership === 'leave') {
- const roomId = member && member.roomId ? member.roomId : RoomViewStore.getRoomId();
- const onInviteUserButton = async() => {
+ const roomId = member && member.roomId ? member.roomId : this.props.roomId;
+ const onInviteUserButton = async () => {
try {
// We use a MultiInviter to re-use the invite logic, even though
// we're only inviting one user.
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index d4b607a93a..e15ca047ac 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -22,7 +22,6 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import Modal from '../../../Modal';
import sdk from '../../../index';
import dis from '../../../dispatcher';
-import RoomViewStore from '../../../stores/RoomViewStore';
import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
import Stickerpicker from './Stickerpicker';
import { makeRoomPermalink } from '../../../matrix-to';
@@ -63,7 +62,7 @@ export default class MessageComposer extends React.Component {
isRichTextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'),
},
showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
- isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
+ isQuoting: Boolean(this.props.roomViewStore.getQuotingEvent()),
tombstone: this._getRoomTombstone(),
};
}
@@ -75,7 +74,7 @@ export default class MessageComposer extends React.Component {
// XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
MatrixClientPeg.get().on("event", this.onEvent);
MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
- this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
+ this._roomStoreToken = this.props.roomViewStore.addListener(this._onRoomViewStoreUpdate);
this._waitForOwnMember();
}
@@ -124,14 +123,14 @@ export default class MessageComposer extends React.Component {
}
_onRoomViewStoreUpdate() {
- const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
+ const isQuoting = Boolean(this.props.roomViewStore.getQuotingEvent());
if (this.state.isQuoting === isQuoting) return;
this.setState({ isQuoting });
}
onUploadClick(ev) {
if (MatrixClientPeg.get().isGuest()) {
- dis.dispatch({action: 'require_registration'});
+ this.props.roomViewStore.getDispatcher().dispatch({action: 'require_registration'});
return;
}
@@ -165,7 +164,7 @@ export default class MessageComposer extends React.Component {
}
}
- const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
+ const isQuoting = Boolean(this.props.roomViewStore.getQuotingEvent());
let replyToWarning = null;
if (isQuoting) {
replyToWarning =
+
);
+ }
return
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index 3c4872188a..8c74b3aff5 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -1,5 +1,5 @@
/*
-Copyright 2018 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,48 +15,150 @@ limitations under the License.
*/
import React from 'react';
-import QuestionDialog from './QuestionDialog';
import Modal from '../../../Modal';
+import sdk from '../../../index';
import dis from '../../../dispatcher';
import { _t } from '../../../languageHandler';
import MatrixClientPeg from '../../../MatrixClientPeg';
+import SettingsStore from "../../../settings/SettingsStore";
-export default (props) => {
- const description = _t("For security, logging out will delete any end-to-end " +
- "encryption keys from this browser. If you want to be able " +
- "to decrypt your conversation history from future Riot sessions, " +
- "please export your room keys for safe-keeping.");
+export default class LogoutDialog extends React.Component {
+ constructor() {
+ super();
+ this._onSettingsLinkClick = this._onSettingsLinkClick.bind(this);
+ this._onExportE2eKeysClicked = this._onExportE2eKeysClicked.bind(this);
+ this._onFinished = this._onFinished.bind(this);
+ this._onSetRecoveryMethodClick = this._onSetRecoveryMethodClick.bind(this);
+ this._onLogoutConfirm = this._onLogoutConfirm.bind(this);
+ }
- const onExportE2eKeysClicked = () => {
+ _onSettingsLinkClick() {
+ // close dialog
+ if (this.props.onFinished) {
+ this.props.onFinished();
+ }
+ }
+
+ _onExportE2eKeysClicked() {
Modal.createTrackedDialogAsync('Export E2E Keys', '',
import('../../../async-components/views/dialogs/ExportE2eKeysDialog'),
{
matrixClient: MatrixClientPeg.get(),
},
);
- };
+ }
- const onFinished = (confirmed) => {
+ _onFinished(confirmed) {
if (confirmed) {
dis.dispatch({action: 'logout'});
}
// close dialog
- if (props.onFinished) {
- props.onFinished();
+ if (this.props.onFinished) {
+ this.props.onFinished();
}
- };
+ }
- return (
+
;
+ } else {
+ description = {_t( + "When you log out, you'll lose your secure message history. To prevent " + + "this, set up a recovery method.", + )}
+{_t( + "Alternatively, advanced users can also manually export encryption keys in " + + "Settings before logging out.", {}, + { + a: sub => {sub}, + }, + )}
+{_t(
+ "For security, logging out will delete any end-to-end " +
+ "encryption keys from this browser. If you want to be able " +
+ "to decrypt your conversation history from future Riot sessions, " +
+ "please export your room keys for safe-keeping.",
+ )}
;
+ }
+
+ if (SettingsStore.isFeatureEnabled("feature_keybackup")) {
+ if (!MatrixClientPeg.get().getKeyBackupEnabled()) {
+ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+ const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+ // Not quite a standard question dialog as the primary button cancels
+ // the action and does something else instead, whilst non-default button
+ // confirms the action.
+ return (
+ { description }
+
+ {
@@ -229,7 +228,7 @@ export default class MessageComposer extends React.Component {
if (!call) {
return;
}
- dis.dispatch({
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'hangup',
// hangup the call for this room, which may not be the room in props
// (e.g. conferences which will hangup the 1:1 room instead)
@@ -238,7 +237,7 @@ export default class MessageComposer extends React.Component {
}
onCallClick(ev) {
- dis.dispatch({
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'place_call',
type: ev.shiftKey ? "screensharing" : "video",
room_id: this.props.room.roomId,
@@ -246,7 +245,7 @@ export default class MessageComposer extends React.Component {
}
onVoiceCallClick(ev) {
- dis.dispatch({
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'place_call',
type: "voice",
room_id: this.props.room.roomId,
@@ -282,7 +281,7 @@ export default class MessageComposer extends React.Component {
ev.preventDefault();
const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
- dis.dispatch({
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'view_room',
highlighted: true,
room_id: replacementRoomId,
@@ -421,8 +420,10 @@ export default class MessageComposer extends React.Component {
controls.push(
- ;
}
+ let toggleRightPanelButton;
+ if (this.props.isGrid) {
+ toggleRightPanelButton =
+
);
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index d03c5fc96d..01447012e6 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -1,5 +1,5 @@
/*
-Copyright 2018 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,10 +20,16 @@ import sdk from "../../../index";
import { _t } from "../../../languageHandler";
import Modal from "../../../Modal";
import MatrixClientPeg from "../../../MatrixClientPeg";
+import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
export default class RoomRecoveryReminder extends React.PureComponent {
static propTypes = {
- onFinished: PropTypes.func.isRequired,
+ // called if the user sets the option to suppress this reminder in the future
+ onDontAskAgainSet: PropTypes.func,
+ }
+
+ static defaultProps = {
+ onDontAskAgainSet: function() {},
}
constructor(props) {
@@ -82,7 +88,6 @@ export default class RoomRecoveryReminder extends React.PureComponent {
Modal.createTrackedDialog('Device Verify Dialog', '', DeviceVerifyDialog, {
userId: MatrixClientPeg.get().credentials.userId,
device: this.state.unverifiedDevice,
- onFinished: this.props.onFinished,
});
return;
}
@@ -91,9 +96,6 @@ export default class RoomRecoveryReminder extends React.PureComponent {
// we'll show the create key backup flow.
Modal.createTrackedDialogAsync("Key Backup", "Key Backup",
import("../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog"),
- {
- onFinished: this.props.onFinished,
- },
);
}
@@ -103,10 +105,14 @@ export default class RoomRecoveryReminder extends React.PureComponent {
Modal.createTrackedDialogAsync("Ignore Recovery Reminder", "Ignore Recovery Reminder",
import("../../../async-components/views/dialogs/keybackup/IgnoreRecoveryReminderDialog"),
{
- onDontAskAgain: () => {
- // Report false to the caller, who should prevent the
- // reminder from appearing in the future.
- this.props.onFinished(false);
+ onDontAskAgain: async () => {
+ await SettingsStore.setValue(
+ "showRoomRecoveryReminder",
+ null,
+ SettingLevel.ACCOUNT,
+ false,
+ );
+ this.props.onDontAskAgainSet();
},
onSetup: () => {
this.showSetupDialog();
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index bce4d15f16..95073b7be8 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -29,7 +29,6 @@ import * as RoomNotifs from '../../../RoomNotifs';
import * as FormattingUtils from '../../../utils/FormattingUtils';
import AccessibleButton from '../elements/AccessibleButton';
import ActiveRoomObserver from '../../../ActiveRoomObserver';
-import RoomViewStore from '../../../stores/RoomViewStore';
import SettingsStore from "../../../settings/SettingsStore";
module.exports = React.createClass({
@@ -62,7 +61,7 @@ module.exports = React.createClass({
roomName: this.props.room.name,
notifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
notificationCount: this.props.room.getUnreadNotificationCount(),
- selected: this.props.room.roomId === RoomViewStore.getRoomId(),
+ selected: this.props.room.roomId === ActiveRoomObserver.getActiveRoomId(),
});
},
@@ -117,9 +116,9 @@ module.exports = React.createClass({
}
},
- _onActiveRoomChange: function() {
+ _onActiveRoomChange: function(activeRoomId) {
this.setState({
- selected: this.props.room.roomId === RoomViewStore.getRoomId(),
+ selected: this.props.room.roomId === activeRoomId,
});
},
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 03b98d28a0..b1c94c3067 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -21,13 +21,15 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import { _t } from '../../../languageHandler';
import Modal from '../../../Modal';
-export default class KeyBackupPanel extends React.Component {
+export default class KeyBackupPanel extends React.PureComponent {
constructor(props) {
super(props);
this._startNewBackup = this._startNewBackup.bind(this);
this._deleteBackup = this._deleteBackup.bind(this);
this._verifyDevice = this._verifyDevice.bind(this);
+ this._onKeyBackupSessionsRemaining =
+ this._onKeyBackupSessionsRemaining.bind(this);
this._onKeyBackupStatus = this._onKeyBackupStatus.bind(this);
this._restoreBackup = this._restoreBackup.bind(this);
@@ -36,6 +38,7 @@ export default class KeyBackupPanel extends React.Component {
loading: true,
error: null,
backupInfo: null,
+ sessionsRemaining: 0,
};
}
@@ -43,6 +46,10 @@ export default class KeyBackupPanel extends React.Component {
this._loadBackupStatus();
MatrixClientPeg.get().on('crypto.keyBackupStatus', this._onKeyBackupStatus);
+ MatrixClientPeg.get().on(
+ 'crypto.keyBackupSessionsRemaining',
+ this._onKeyBackupSessionsRemaining,
+ );
}
componentWillUnmount() {
@@ -50,9 +57,19 @@ export default class KeyBackupPanel extends React.Component {
if (MatrixClientPeg.get()) {
MatrixClientPeg.get().removeListener('crypto.keyBackupStatus', this._onKeyBackupStatus);
+ MatrixClientPeg.get().removeListener(
+ 'crypto.keyBackupSessionsRemaining',
+ this._onKeyBackupSessionsRemaining,
+ );
}
}
+ _onKeyBackupSessionsRemaining(sessionsRemaining) {
+ this.setState({
+ sessionsRemaining,
+ });
+ }
+
_onKeyBackupStatus() {
this._loadBackupStatus();
}
@@ -144,57 +161,70 @@ export default class KeyBackupPanel extends React.Component {
} else if (this.state.backupInfo) {
let clientBackupStatus;
if (MatrixClientPeg.get().getKeyBackupEnabled()) {
- clientBackupStatus = _t("This device is uploading keys to this backup");
+ clientBackupStatus = _t("This device is using key backup");
} else {
// XXX: display why and how to fix it
clientBackupStatus = _t(
- "This device is not uploading keys to this backup", {},
+ "This device is not using key backup", {},
{b: x => {x}},
);
}
+ let uploadStatus;
+ const { sessionsRemaining } = this.state;
+ if (!MatrixClientPeg.get().getKeyBackupEnabled()) {
+ // No upload status to show when backup disabled.
+ uploadStatus = "";
+ } else if (sessionsRemaining > 0) {
+ uploadStatus =
@@ -419,7 +439,8 @@ module.exports = React.createClass({
{ saveButton }
{ cancelButton }
{ rightRow }
-
+ {_t("Backing up %(sessionsRemaining)s keys...", { sessionsRemaining })} ;
+ } else {
+ uploadStatus =
+
+ {_t("All keys backed up")} ;
+ }
+
let backupSigStatuses = this.state.backupSigStatus.sigs.map((sig, i) => {
const deviceName = sig.device.getDisplayName() || sig.device.deviceId;
- const sigStatusSubstitutions = {
- validity: sub =>
-
- {sub}
- ,
- verify: sub =>
-
- {sub}
- ,
- device: sub => {deviceName},
- };
+ const validity = sub =>
+
+ {sub}
+ ;
+ const verify = sub =>
+
+ {sub}
+ ;
+ const device = sub => {deviceName};
let sigStatus;
if (sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key()) {
sigStatus = _t(
"Backup has a
+
{_t("Algorithm: ")}{this.state.backupInfo.algorithm}
{clientBackupStatus}
+ {uploadStatus}
{backupSigStatuses}