+ { 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.")} );
+ }
+ }) }
+
+ {matchText}
@@ -344,7 +385,10 @@ export default React.createClass({
_renderPhaseShowKey: function() {
let bodyText;
if (this.state.setPassPhrase) {
- bodyText = _t("As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.");
+ bodyText = _t(
+ "As a safety net, you can use it to restore your encrypted message " +
+ "history if you forget your Recovery Passphrase.",
+ );
} else {
bodyText = _t("As a safety net, you can use it to restore your encrypted message history.");
}
@@ -352,7 +396,7 @@ export default React.createClass({
return
-
+
{_t("Make a copy of this Recovery Key and keep it safe.")}
{bodyText}
-+
{_t("Your Recovery Key")}
@@ -369,7 +413,7 @@ export default React.createClass({
-
;
},
@@ -413,8 +456,10 @@ export default React.createClass({
_renderPhaseDone: function() {
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
return {_t(text)}
-
{_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..db86178b5a 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.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.
@@ -24,15 +24,21 @@ import Modal from "../../../../Modal";
export default class NewRecoveryMethodDialog extends React.PureComponent {
static propTypes = {
+ // As returned by js-sdk getKeyBackupVersion()
+ newVersionInfo: PropTypes.object,
onFinished: PropTypes.func.isRequired,
}
+ onOkClick = () => {
+ this.props.onFinished();
+ }
+
onGoToSettingsClick = () => {
this.props.onFinished();
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
@@ -41,8 +47,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
// sending our own new keys to it.
let backupSigStatus;
try {
- const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
- backupSigStatus = await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo);
+ backupSigStatus = await MatrixClientPeg.get().isKeyBackupTrusted(this.props.newVersionInfo);
} catch (e) {
console.log("Unable to fetch key backup status", e);
return;
@@ -71,39 +76,62 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
render() {
const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
- const title =
+
+ const title =
{_t("New Recovery Method")}
;
+ const newMethodDetected =
-
);
}
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
new file mode 100644
index 0000000000..1975fbe6d6
--- /dev/null
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -0,0 +1,80 @@
+/*
+Copyright 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.
+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 PropTypes from "prop-types";
+import sdk from "../../../../index";
+import dis from "../../../../dispatcher";
+import { _t } from "../../../../languageHandler";
+import Modal from "../../../../Modal";
+
+export default class RecoveryMethodRemovedDialog extends React.PureComponent {
+ static propTypes = {
+ onFinished: PropTypes.func.isRequired,
+ }
+
+ onGoToSettingsClick = () => {
+ this.props.onFinished();
+ dis.dispatch({ action: 'view_user_settings' });
+ }
+
+ onSetupClick = () => {
+ this.props.onFinished();
+ Modal.createTrackedDialogAsync("Key Backup", "Key Backup",
+ import("./CreateKeyBackupDialog"),
+ );
+ }
+
+ render() {
+ const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
+ const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
+
+ const title =
+ {_t("Recovery Method Removed")}
+ ;
+
+ return (
+
+
+ );
+ }
+}
diff --git a/src/autocomplete/AutocompleteProvider.js b/src/autocomplete/AutocompleteProvider.js
index f9fb61d3a3..98ae83c526 100644
--- a/src/autocomplete/AutocompleteProvider.js
+++ b/src/autocomplete/AutocompleteProvider.js
@@ -41,8 +41,12 @@ export default class AutocompleteProvider {
/**
* Of the matched commands in the query, returns the first that contains or is contained by the selection, or null.
+ * @param {string} query The query string
+ * @param {SelectionRange} selection Selection to search
+ * @param {boolean} force True if the user is forcing completion
+ * @return {object} { command, range } where both objects fields are null if no match
*/
- getCurrentCommand(query: string, selection: SelectionRange, force: boolean = false): ?string {
+ getCurrentCommand(query: string, selection: SelectionRange, force: boolean = false) {
let commandRegex = this.commandRegex;
if (force && this.shouldForceComplete()) {
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index e7b89fe576..af2744950f 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -60,8 +60,8 @@ const PROVIDER_COMPLETION_TIMEOUT = 3000;
export default class Autocompleter {
constructor(room: Room) {
this.room = room;
- this.providers = PROVIDERS.map((p) => {
- return new p(room);
+ this.providers = PROVIDERS.map((Prov) => {
+ return new Prov(room);
});
}
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/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 2eae053d72..d4a5ec5e74 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -41,7 +41,7 @@ export default class UserProvider extends AutocompleteProvider {
users: Array = null;
room: Room = null;
- constructor(room) {
+ constructor(room: Room) {
super(USER_REGEX, FORCED_USER_REGEX);
this.room = room;
this.matcher = new QueryMatcher([], {
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 = (
+
+
+
+ );
+ }
+}
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 = {
- Modal.createTrackedDialogAsync('New Recovery Method', 'New Recovery Method',
- import('../../async-components/views/dialogs/keybackup/NewRecoveryMethodDialog'),
- );
+ cli.on("crypto.keyBackupFailed", async (errcode) => {
+ let haveNewVersion;
+ let newVersionInfo;
+ // if key backup is still enabled, there must be a new backup in place
+ if (MatrixClientPeg.get().getKeyBackupEnabled()) {
+ haveNewVersion = true;
+ } else {
+ // otherwise check the server to see if there's a new one
+ try {
+ newVersionInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+ if (newVersionInfo !== null) haveNewVersion = true;
+ } catch (e) {
+ console.error("Saw key backup error but failed to check backup version!", e);
+ return;
+ }
+ }
+
+ if (haveNewVersion) {
+ Modal.createTrackedDialogAsync('New Recovery Method', 'New Recovery Method',
+ import('../../async-components/views/dialogs/keybackup/NewRecoveryMethodDialog'),
+ { newVersionInfo },
+ );
+ } else {
+ Modal.createTrackedDialogAsync('Recovery Method Removed', 'Recovery Method Removed',
+ import('../../async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog'),
+ );
+ }
});
// Fire the tinter right on startup to ensure the default theme is applied
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index be40957673..925b90c6d8 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -165,7 +165,7 @@ export default class RightPanel extends React.Component {
} else if (this.state.phase === RightPanel.Phase.GroupRoomList) {
panel = {
- 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( + "A new recovery passphrase and key for Secure " + + "Messages have been detected.", + )}
; + + const hackWarning ={_t( + "If you didn't set the new recovery method, an " + + "attacker may be trying to access your account. " + + "Change your account password and set a new recovery " + + "method immediately in Settings.", + )}
; + + let content; + if (MatrixClientPeg.get().getKeyBackupEnabled()) { + content =
+ {newMethodDetected}
+
;
+ } else {
+ content = {_t( + "This device is encrypting history using the new recovery method.", + )}
+ {hackWarning} +
+ {newMethodDetected}
+
;
+ }
+
return (
- {_t( + "Setting up Secure Messages on this device " + + "will re-encrypt this device's message history with " + + "the new recovery method.", + )}
+ {hackWarning} +
-
+ {content}
{_t( - "A new recovery passphrase and key for Secure " + - "Messages has been detected.", - )}
-{_t( - "Setting up Secure Messages on this device " + - "will re-encrypt this device's message history with " + - "the new recovery method.", - )}
-{_t( - "If you didn't set the new recovery method, an " + - "attacker may be trying to access your account. " + - "Change your account password and set a new recovery " + - "method immediately in Settings.", - )}
-
+
+ {_t( + "This device has detected that your recovery passphrase and key " + + "for Secure Messages have been removed.", + )}
+{_t( + "If you did this accidentally, you can setup Secure Messages on " + + "this device which will re-encrypt this device's message " + + "history with a new recovery method.", + )}
+{_t( + "If you didn't remove the recovery method, an " + + "attacker may be trying to access your account. " + + "Change your account password and set a new recovery " + + "method immediately in Settings.", + )}
+
+
+ );
+ }
+
+ 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/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index cbe80763a6..6276a45839 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -389,6 +389,17 @@ module.exports = React.createClass({
const suggestedList = [];
results.forEach((result) => {
if (result.room_id) {
+ const client = MatrixClientPeg.get();
+ const room = client.getRoom(result.room_id);
+ if (room) {
+ const tombstone = room.currentState.getStateEvents('m.room.tombstone', '');
+ if (tombstone && tombstone.getContent() && tombstone.getContent()["replacement_room"]) {
+ const replacementRoom = client.getRoom(tombstone.getContent()["replacement_room"]);
+
+ // Skip rooms with tombstones where we are also aware of the replacement room.
+ if (replacementRoom) return;
+ }
+ }
suggestedList.push({
addressType: 'mx-room-id',
address: result.room_id,
diff --git a/src/components/views/dialogs/AskInviteAnywayDialog.js b/src/components/views/dialogs/AskInviteAnywayDialog.js
new file mode 100644
index 0000000000..5c61c3a694
--- /dev/null
+++ b/src/components/views/dialogs/AskInviteAnywayDialog.js
@@ -0,0 +1,81 @@
+/*
+Copyright 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.
+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 PropTypes from 'prop-types';
+import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
+import {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
+
+export default React.createClass({
+ propTypes: {
+ unknownProfileUsers: PropTypes.array.isRequired, // [ {userId, errorText}... ]
+ onInviteAnyways: PropTypes.func.isRequired,
+ onGiveUp: PropTypes.func.isRequired,
+ onFinished: PropTypes.func.isRequired,
+ },
+
+ _onInviteClicked: function() {
+ this.props.onInviteAnyways();
+ this.props.onFinished(true);
+ },
+
+ _onInviteNeverWarnClicked: function() {
+ SettingsStore.setValue("alwaysInviteUnknownUsers", null, SettingLevel.ACCOUNT, true);
+ this.props.onInviteAnyways();
+ this.props.onFinished(true);
+ },
+
+ _onGiveUpClicked: function() {
+ this.props.onGiveUp();
+ this.props.onFinished(false);
+ },
+
+ render: function() {
+ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+
+ const errorList = this.props.unknownProfileUsers
+ .map(address => {address.userId}: {address.errorText} );
+
+ return (
+
+
+ );
+ },
+});
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/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 64c0478d41..5370b4d8b5 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -24,6 +24,8 @@ import ObjectUtils from '../../../ObjectUtils';
import AppsDrawer from './AppsDrawer';
import { _t } from '../../../languageHandler';
import classNames from 'classnames';
+import RateLimitedFunc from '../../../ratelimitedfunc';
+import SettingsStore from "../../../settings/SettingsStore";
module.exports = React.createClass({
@@ -60,6 +62,22 @@ module.exports = React.createClass({
hideAppsDrawer: false,
},
+ getInitialState: function() {
+ return { counters: this._computeCounters() };
+ },
+
+ componentDidMount: function() {
+ const cli = MatrixClientPeg.get();
+ cli.on("RoomState.events", this._rateLimitedUpdate);
+ },
+
+ componentWillUnmount: function() {
+ const cli = MatrixClientPeg.get();
+ if (cli) {
+ cli.removeListener("RoomState.events", this._rateLimitedUpdate);
+ }
+ },
+
shouldComponentUpdate: function(nextProps, nextState) {
return (!ObjectUtils.shallowEqual(this.props, nextProps) ||
!ObjectUtils.shallowEqual(this.state, nextState));
@@ -82,6 +100,43 @@ module.exports = React.createClass({
ev.preventDefault();
},
+ _rateLimitedUpdate: new RateLimitedFunc(function() {
+ if (SettingsStore.isFeatureEnabled("feature_state_counters")) {
+ this.setState({counters: this._computeCounters()});
+ }
+ }, 500),
+
+ _computeCounters: function() {
+ let counters = [];
+
+ if (this.props.room && SettingsStore.isFeatureEnabled("feature_state_counters")) {
+ const stateEvs = this.props.room.currentState.getStateEvents('re.jki.counter');
+ stateEvs.sort((a, b) => {
+ return a.getStateKey() < b.getStateKey();
+ });
+
+ stateEvs.forEach((ev, idx) => {
+ const title = ev.getContent().title;
+ const value = ev.getContent().value;
+ const link = ev.getContent().link;
+ const severity = ev.getContent().severity || "normal";
+ const stateKey = ev.getStateKey();
+
+ if (title && value && severity) {
+ counters.push({
+ "title": title,
+ "value": value,
+ "link": link,
+ "severity": severity,
+ "stateKey": stateKey
+ })
+ }
+ });
+ }
+
+ return counters;
+ },
+
render: function() {
const CallView = sdk.getComponent("voip.CallView");
const TintableSvg = sdk.getComponent("elements.TintableSvg");
@@ -145,6 +200,58 @@ module.exports = React.createClass({
hide={this.props.hideAppsDrawer}
/>;
+ let stateViews = null;
+ if (this.state.counters && SettingsStore.isFeatureEnabled("feature_state_counters")) {
+ let counters = [];
+
+ this.state.counters.forEach((counter, idx) => {
+ const title = counter.title;
+ const value = counter.value;
+ const link = counter.link;
+ const severity = counter.severity;
+ const stateKey = counter.stateKey;
+
+ if (title && value && severity) {
+ let span = { title }: { value }
+
+ if (link) {
+ span = (
+
+ { span }
+
+ );
+ }
+
+ span = (
+
+ {span}
+
+ );
+
+ counters.push(span);
+ counters.push(
+ ─
+ );
+ }
+ });
+
+ if (counters.length > 0) {
+ counters.pop(); // remove last deliminator
+ stateViews = (
+
+
);
+ }
return
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index cbe80763a6..6276a45839 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -389,6 +389,17 @@ module.exports = React.createClass({
const suggestedList = [];
results.forEach((result) => {
if (result.room_id) {
+ const client = MatrixClientPeg.get();
+ const room = client.getRoom(result.room_id);
+ if (room) {
+ const tombstone = room.currentState.getStateEvents('m.room.tombstone', '');
+ if (tombstone && tombstone.getContent() && tombstone.getContent()["replacement_room"]) {
+ const replacementRoom = client.getRoom(tombstone.getContent()["replacement_room"]);
+
+ // Skip rooms with tombstones where we are also aware of the replacement room.
+ if (replacementRoom) return;
+ }
+ }
suggestedList.push({
addressType: 'mx-room-id',
address: result.room_id,
diff --git a/src/components/views/dialogs/AskInviteAnywayDialog.js b/src/components/views/dialogs/AskInviteAnywayDialog.js
new file mode 100644
index 0000000000..5c61c3a694
--- /dev/null
+++ b/src/components/views/dialogs/AskInviteAnywayDialog.js
@@ -0,0 +1,81 @@
+/*
+Copyright 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.
+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 PropTypes from 'prop-types';
+import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
+import {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
+
+export default React.createClass({
+ propTypes: {
+ unknownProfileUsers: PropTypes.array.isRequired, // [ {userId, errorText}... ]
+ onInviteAnyways: PropTypes.func.isRequired,
+ onGiveUp: PropTypes.func.isRequired,
+ onFinished: PropTypes.func.isRequired,
+ },
+
+ _onInviteClicked: function() {
+ this.props.onInviteAnyways();
+ this.props.onFinished(true);
+ },
+
+ _onInviteNeverWarnClicked: function() {
+ SettingsStore.setValue("alwaysInviteUnknownUsers", null, SettingLevel.ACCOUNT, true);
+ this.props.onInviteAnyways();
+ this.props.onFinished(true);
+ },
+
+ _onGiveUpClicked: function() {
+ this.props.onGiveUp();
+ this.props.onFinished(false);
+ },
+
+ render: function() {
+ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+
+ const errorList = this.props.unknownProfileUsers
+ .map(address =>
+
+
+ {_t("The following users may not exist - would you like to invite them anyways?")}
+-
+ { errorList }
+
+
+
+
+
+
+ { counters }
+
+ );
+ }
+ }
+
const classes = classNames({
"mx_RoomView_auxPanel": true,
"mx_RoomView_auxPanel_fullHeight": this.props.fullHeight,
@@ -156,6 +263,7 @@ module.exports = React.createClass({
return (
+ { stateViews }
{ appsDrawer }
{ fileDropTarget }
{ callView }
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index e978bf438a..692111361a 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -62,6 +62,7 @@ const stateEventTileTypes = {
'm.room.pinned_events': 'messages.TextualEvent',
'm.room.server_acl': 'messages.TextualEvent',
'im.vector.modular.widgets': 'messages.TextualEvent',
+ 'm.room.tombstone': 'messages.TextualEvent',
};
function getHandlerTile(ev) {
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..c648ca615b 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 =
{
@@ -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,10 +281,22 @@ export default class MessageComposer extends React.Component {
ev.preventDefault();
const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
- dis.dispatch({
+ const replacementRoom = MatrixClientPeg.get().getRoom(replacementRoomId);
+ let createEventId = null;
+ if (replacementRoom) {
+ const createEvent = replacementRoom.currentState.getStateEvents('m.room.create', '');
+ if (createEvent && createEvent.getId()) createEventId = createEvent.getId();
+ }
+
+ this.props.roomViewStore.getDispatcher().dispatch({
action: 'view_room',
highlighted: true,
+ event_id: createEventId,
room_id: replacementRoomId,
+
+ // Try to join via the server that sent the event. This converts $something:example.org
+ // into a server domain by splitting on colons and ignoring the first entry ("$something").
+ via_servers: [this.state.tombstone.getId().split(':').splice(1).join(':')],
});
}
@@ -421,8 +432,10 @@ export default class MessageComposer extends React.Component {
controls.push(
\n Use the long description to introduce new members to the community, or distribute\n some important links\n \n You can even use 'img' tags\n \n Use the long description to introduce new members to the community, or distribute\n some important links\n \n You can even use 'img' tags\n;
+ return
;
}
}
};
@@ -1538,7 +1549,6 @@ export default class MessageComposerInput extends React.Component {
getSelectionRange(editorState: Value) {
let beginning = false;
- const query = this.getAutocompleteQuery(editorState);
const firstChild = editorState.document.nodes.get(0);
const firstGrandChild = firstChild && firstChild.nodes.get(0);
beginning = (firstChild && firstGrandChild &&
@@ -1589,7 +1599,7 @@ export default class MessageComposerInput extends React.Component {
return (
- ;
}
+ let toggleRightPanelButton;
+ if (this.props.isGrid) {
+ toggleRightPanelButton =
+
);
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index cb3cb49cd4..1a714e3a84 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -102,6 +102,7 @@ module.exports = React.createClass({
cli.on("Event.decrypted", this.onEventDecrypted);
cli.on("accountData", this.onAccountData);
cli.on("Group.myMembership", this._onGroupMyMembership);
+ cli.on("RoomState.events", this.onRoomStateEvents);
const dmRoomMap = DMRoomMap.shared();
// A map between tags which are group IDs and the room IDs of rooms that should be kept
@@ -230,6 +231,7 @@ module.exports = React.createClass({
MatrixClientPeg.get().removeListener("Event.decrypted", this.onEventDecrypted);
MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
MatrixClientPeg.get().removeListener("Group.myMembership", this._onGroupMyMembership);
+ MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
}
if (this._tagStoreToken) {
@@ -253,6 +255,12 @@ module.exports = React.createClass({
this.updateVisibleRooms();
},
+ onRoomStateEvents: function(ev, state) {
+ if (ev.getType() === "m.room.create" || ev.getType() === "m.room.tombstone") {
+ this.updateVisibleRooms();
+ }
+ },
+
onDeleteRoom: function(roomId) {
this.updateVisibleRooms();
},
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}
HTML for your community's page
\nHTML for your community's page
\n