+ { _t("To return to your account in future you need to set a password") }
+
: null
+ }
{accountJsx}
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 (
+
+ );
+ }
+
+ return (
+
+ {content}
+
+ );
+ },
+});
diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.js
index 82256970de..3c38064ee1 100644
--- a/src/components/views/dialogs/SetEmailDialog.js
+++ b/src/components/views/dialogs/SetEmailDialog.js
@@ -154,7 +154,7 @@ export default React.createClass({
/>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e7f8199f9c..6334c797e8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -911,5 +911,13 @@
"Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
"Disable Peer-to-Peer for 1:1 calls": "Disable Peer-to-Peer for 1:1 calls",
"Do you want to set an email address?": "Do you want to set an email address?",
- "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications."
+ "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
+ "To return to your account in future you need to set a password": "To return to your account in future you need to set a password",
+ "Skip":"Skip",
+ "Start verification": "Start verification",
+ "Share without verifying": "Share without verifying",
+ "Ignore request": "Ignore request",
+ "You added a new device '%(displayName)s', which is requesting encryption keys.": "You added a new device '%(displayName)s', which is requesting encryption keys.",
+ "Your unverified device '%(displayName)s' is requesting encryption keys.": "Your unverified device '%(displayName)s' is requesting encryption keys.",
+ "Encryption key request": "Encryption key request"
}