@@ -1358,7 +1422,7 @@ module.exports = React.createClass({
}
// needs to be before normal PageTypes as you are logged in technically
- if (this.state.screen == 'post_registration') {
+ if (this.state.view === VIEWS.POST_REGISTRATION) {
const PostRegistration = sdk.getComponent('structures.login.PostRegistration');
return (
;
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index fc13f0bdcf..9a5eb07cde 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -21,6 +21,7 @@ const MatrixClientPeg = require("../../MatrixClientPeg");
const PlatformPeg = require("../../PlatformPeg");
const Modal = require('../../Modal');
const dis = require("../../dispatcher");
+import sessionStore from '../../stores/SessionStore';
const q = require('q');
const packageJson = require('../../../package.json');
const UserSettingsStore = require('../../UserSettingsStore');
@@ -243,6 +244,12 @@ module.exports = React.createClass({
this.setState({
language: languageHandler.getCurrentLanguage(),
});
+
+ this._sessionStore = sessionStore;
+ this._sessionStoreToken = this._sessionStore.addListener(
+ this._setStateFromSessionStore,
+ );
+ this._setStateFromSessionStore();
},
componentDidMount: function() {
@@ -269,6 +276,22 @@ module.exports = React.createClass({
}
},
+ // `UserSettings` assumes that the client peg will not be null, so give it some
+ // sort of assurance here by only allowing a re-render if the client is truthy.
+ //
+ // This is required because `UserSettings` maintains its own state and if this state
+ // updates (e.g. during _setStateFromSessionStore) after the client peg has been made
+ // null (during logout), then it will attempt to re-render and throw errors.
+ shouldComponentUpdate: function() {
+ return Boolean(MatrixClientPeg.get());
+ },
+
+ _setStateFromSessionStore: function() {
+ this.setState({
+ userHasGeneratedPassword: Boolean(this._sessionStore.getCachedPassword()),
+ });
+ },
+
_electronSettings: function(ev, settings) {
this.setState({ electron_settings: settings });
},
@@ -861,6 +884,21 @@ module.exports = React.createClass({
;
},
+ _renderCheckUpdate: function() {
+ const platform = PlatformPeg.get();
+ if ('canSelfUpdate' in platform && platform.canSelfUpdate() && 'startUpdateCheck' in platform) {
+ return
-
- );
- } else if (this.state.screen == 'register') {
+ if (this.state.view === VIEWS.LOGGED_IN) {
+ // `ready` and `view==LOGGED_IN` may be set before `page_type` (because the
+ // latter is set via the dispatcher). If we don't yet have a `page_type`,
+ // keep showing the spinner for now.
+ if (this.state.ready && this.state.page_type) {
+ /* for now, we stuff the entirety of our props and state into the LoggedInView.
+ * we should go through and figure out what we actually need to pass down, as well
+ * as using something like redux to avoid having a billion bits of state kicking around.
+ */
+ const LoggedInView = sdk.getComponent('structures.LoggedInView');
+ return (
+
+
+ );
+ }
+ }
+
+ if (this.state.view === VIEWS.REGISTER) {
const Registration = sdk.getComponent('structures.login.Registration');
return (
+
;
+ }
+ return ;
+ },
+
_renderBulkOptions: function() {
const invitedRooms = MatrixClientPeg.get().getRooms().filter((r) => {
return r.hasMembershipState(this._me, "invite");
@@ -1201,10 +1239,14 @@ module.exports = React.createClass({
{_t('Updates')}
+
+
+ {_t('Check for update')}
+
+
+ { _t("Account") }
-
{ _t("Sign out") }
+ { this.state.userHasGeneratedPassword ?
+
@@ -1258,6 +1300,8 @@ module.exports = React.createClass({
+ {this._renderCheckUpdate()}
+
{this._renderClearCache()}
{this._renderDeactivateAccount()}
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 17fbf445b2..388198bb02 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -218,29 +218,29 @@ module.exports = React.createClass({
}
trackPromise.then((teamToken) => {
- this.props.onLoggedIn({
+ return this.props.onLoggedIn({
userId: response.user_id,
deviceId: response.device_id,
homeserverUrl: this._matrixClient.getHomeserverUrl(),
identityServerUrl: this._matrixClient.getIdentityServerUrl(),
accessToken: response.access_token
}, teamToken);
- }).then(() => {
- return this._setupPushers();
+ }).then((cli) => {
+ return this._setupPushers(cli);
});
},
- _setupPushers: function() {
+ _setupPushers: function(matrixClient) {
if (!this.props.brand) {
return q();
}
- return MatrixClientPeg.get().getPushers().then((resp)=>{
+ return matrixClient.getPushers().then((resp)=>{
const pushers = resp.pushers;
for (let i = 0; i < pushers.length; ++i) {
if (pushers[i].kind == 'email') {
const emailPusher = pushers[i];
emailPusher.data = { brand: this.props.brand };
- MatrixClientPeg.get().setPusher(emailPusher).done(() => {
+ matrixClient.setPusher(emailPusher).done(() => {
console.log("Set email branding to " + this.props.brand);
}, (error) => {
console.error("Couldn't set email branding: " + error);
diff --git a/src/components/views/dialogs/ChatInviteDialog.js b/src/components/views/dialogs/ChatInviteDialog.js
index 9a14cb91d3..a85efadef7 100644
--- a/src/components/views/dialogs/ChatInviteDialog.js
+++ b/src/components/views/dialogs/ChatInviteDialog.js
@@ -178,7 +178,7 @@ module.exports = React.createClass({
},
onQueryChanged: function(ev) {
- const query = ev.target.value.toLowerCase();
+ const query = ev.target.value;
if (this.queryChangedDebouncer) {
clearTimeout(this.queryChangedDebouncer);
}
@@ -271,10 +271,11 @@ module.exports = React.createClass({
query,
searchError: null,
});
+ const queryLowercase = query.toLowerCase();
const results = [];
MatrixClientPeg.get().getUsers().forEach((user) => {
- if (user.userId.toLowerCase().indexOf(query) === -1 &&
- user.displayName.toLowerCase().indexOf(query) === -1
+ if (user.userId.toLowerCase().indexOf(queryLowercase) === -1 &&
+ user.displayName.toLowerCase().indexOf(queryLowercase) === -1
) {
return;
}
diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js
new file mode 100644
index 0000000000..61391d281c
--- /dev/null
+++ b/src/components/views/dialogs/KeyShareDialog.js
@@ -0,0 +1,172 @@
+/*
+Copyright 2017 Vector Creations 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 Modal from '../../../Modal';
+import React from 'react';
+import sdk from '../../../index';
+
+import { _t } from '../../../languageHandler';
+
+/**
+ * Dialog which asks the user whether they want to share their keys with
+ * an unverified device.
+ *
+ * onFinished is called with `true` if the key should be shared, `false` if it
+ * should not, and `undefined` if the dialog is cancelled. (In other words:
+ * truthy: do the key share. falsy: don't share the keys).
+ */
+export default React.createClass({
+ propTypes: {
+ matrixClient: React.PropTypes.object.isRequired,
+ userId: React.PropTypes.string.isRequired,
+ deviceId: React.PropTypes.string.isRequired,
+ onFinished: React.PropTypes.func.isRequired,
+ },
+
+ getInitialState: function() {
+ return {
+ deviceInfo: null,
+ wasNewDevice: false,
+ };
+ },
+
+ componentDidMount: function() {
+ this._unmounted = false;
+ const userId = this.props.userId;
+ const deviceId = this.props.deviceId;
+
+ // give the client a chance to refresh the device list
+ this.props.matrixClient.downloadKeys([userId], false).then((r) => {
+ if (this._unmounted) { return; }
+
+ const deviceInfo = r[userId][deviceId];
+
+ if(!deviceInfo) {
+ console.warn(`No details found for device ${userId}:${deviceId}`);
+
+ this.props.onFinished(false);
+ return;
+ }
+
+ const wasNewDevice = !deviceInfo.isKnown();
+
+ this.setState({
+ deviceInfo: deviceInfo,
+ wasNewDevice: wasNewDevice,
+ });
+
+ // if the device was new before, it's not any more.
+ if (wasNewDevice) {
+ this.props.matrixClient.setDeviceKnown(
+ userId,
+ deviceId,
+ true,
+ );
+ }
+ }).done();
+ },
+
+ componentWillUnmount: function() {
+ this._unmounted = true;
+ },
+
+
+ _onVerifyClicked: function() {
+ const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
+
+ console.log("KeyShareDialog: Starting verify dialog");
+ Modal.createDialog(DeviceVerifyDialog, {
+ userId: this.props.userId,
+ device: this.state.deviceInfo,
+ onFinished: (verified) => {
+ if (verified) {
+ // can automatically share the keys now.
+ this.props.onFinished(true);
+ }
+ },
+ });
+ },
+
+ _onShareClicked: function() {
+ console.log("KeyShareDialog: User clicked 'share'");
+ this.props.onFinished(true);
+ },
+
+ _onIgnoreClicked: function() {
+ console.log("KeyShareDialog: User clicked 'ignore'");
+ this.props.onFinished(false);
+ },
+
+ _renderContent: function() {
+ const displayName = this.state.deviceInfo.getDisplayName() ||
+ this.state.deviceInfo.deviceId;
+
+ let text;
+ if (this.state.wasNewDevice) {
+ text = "You added a new device '%(displayName)s', which is"
+ + " requesting encryption keys.";
+ } else {
+ text = "Your unverified device '%(displayName)s' is requesting"
+ + " encryption keys.";
+ }
+ text = _t(text, {displayName: displayName});
+
+ return (
+
+ { _t("To return to your account in future you need to set a password") }
+
: null
+ }
{accountJsx}
+
+ );
+ },
+
+ render: function() {
+ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+ const Spinner = sdk.getComponent('views.elements.Spinner');
+
+ let content;
+
+ if (this.state.deviceInfo) {
+ content = this._renderContent();
+ } else {
+ content = (
+ {text}
+ +
+
+
+
+
+
+
+ );
+ }
+
+ return (
+ {_t('Loading device info...')}
+
- Press
-
- to start a chat with someone
+ {_tJsx(
+ "Press to start a chat with someone",
+ [//],
+ [
+ (sub) =>
+ ]
+ )}
;
case 'im.vector.fake.recent':
return
- You're not in any rooms yet! Press
-
- to make a room or
-
- to browse the directory
+ {_tJsx(
+ "You're not in any rooms yet! Press to make a room or"+
+ " to browse the directory",
+ [//, //],
+ [
+ (sub) => ,
+ (sub) =>
+ ]
+ )}
;
}
@@ -497,7 +522,7 @@ module.exports = React.createClass({
return null;
}
- const labelText = 'Drop here to ' + (VERBS[section] || 'tag ' + section);
+ const labelText = phraseForSection(section);
return