Wait for SSSS upgrade to complete
and show a spinner while it completes
This commit is contained in:
parent
b5ea91f44c
commit
be50f80314
2 changed files with 37 additions and 3 deletions
|
@ -169,7 +169,7 @@ export default class DeviceListener {
|
||||||
key: THIS_DEVICE_TOAST_KEY,
|
key: THIS_DEVICE_TOAST_KEY,
|
||||||
title: _t("Encryption upgrade available"),
|
title: _t("Encryption upgrade available"),
|
||||||
icon: "verification_warning",
|
icon: "verification_warning",
|
||||||
props: {kind: 'upgrade_encryption'},
|
props: {kind: 'upgrade_ssss'},
|
||||||
component: sdk.getComponent("toasts.SetupEncryptionToast"),
|
component: sdk.getComponent("toasts.SetupEncryptionToast"),
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -16,6 +16,8 @@ limitations under the License.
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
|
import Modal from '../../../Modal';
|
||||||
|
import { MatrixClientPeg } from '../../../MatrixClientPeg';
|
||||||
import * as sdk from "../../../index";
|
import * as sdk from "../../../index";
|
||||||
import { _t } from '../../../languageHandler';
|
import { _t } from '../../../languageHandler';
|
||||||
import DeviceListener from '../../../DeviceListener';
|
import DeviceListener from '../../../DeviceListener';
|
||||||
|
@ -24,21 +26,52 @@ import { accessSecretStorage } from '../../../CrossSigningManager';
|
||||||
export default class SetupEncryptionToast extends React.PureComponent {
|
export default class SetupEncryptionToast extends React.PureComponent {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
toastKey: PropTypes.string.isRequired,
|
toastKey: PropTypes.string.isRequired,
|
||||||
kind: PropTypes.oneOf(['set_up_encryption', 'verify_this_session', 'upgrade_encryption']).isRequired,
|
kind: PropTypes.oneOf([
|
||||||
|
'set_up_encryption',
|
||||||
|
'verify_this_session',
|
||||||
|
'upgrade_encryption',
|
||||||
|
'upgrade_ssss',
|
||||||
|
]).isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
_onLaterClick = () => {
|
_onLaterClick = () => {
|
||||||
DeviceListener.sharedInstance().dismissEncryptionSetup();
|
DeviceListener.sharedInstance().dismissEncryptionSetup();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
async _waitForCompletion() {
|
||||||
|
if (this.props.kind === 'upgrade_ssss') {
|
||||||
|
return new Promise(resolve => {
|
||||||
|
const recheck = async () => {
|
||||||
|
const needsUpgrade = await MatrixClientPeg.get().secretStorageKeyNeedsUpgrade();
|
||||||
|
if (!needsUpgrade) {
|
||||||
|
MatrixClientPeg.get().removeListener('accountData', recheck);
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
MatrixClientPeg.get().on('accountData', recheck);
|
||||||
|
recheck();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
_onSetupClick = async () => {
|
_onSetupClick = async () => {
|
||||||
accessSecretStorage();
|
const Spinner = sdk.getComponent("elements.Spinner");
|
||||||
|
const modal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
|
||||||
|
try {
|
||||||
|
await accessSecretStorage();
|
||||||
|
await this._waitForCompletion();
|
||||||
|
} finally {
|
||||||
|
modal.close();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
getDescription() {
|
getDescription() {
|
||||||
switch (this.props.kind) {
|
switch (this.props.kind) {
|
||||||
case 'set_up_encryption':
|
case 'set_up_encryption':
|
||||||
case 'upgrade_encryption':
|
case 'upgrade_encryption':
|
||||||
|
case 'upgrade_ssss':
|
||||||
return _t('Verify yourself & others to keep your chats safe');
|
return _t('Verify yourself & others to keep your chats safe');
|
||||||
case 'verify_this_session':
|
case 'verify_this_session':
|
||||||
return _t('Other users may not trust it');
|
return _t('Other users may not trust it');
|
||||||
|
@ -49,6 +82,7 @@ export default class SetupEncryptionToast extends React.PureComponent {
|
||||||
switch (this.props.kind) {
|
switch (this.props.kind) {
|
||||||
case 'set_up_encryption':
|
case 'set_up_encryption':
|
||||||
case 'upgrade_encryption':
|
case 'upgrade_encryption':
|
||||||
|
case 'upgrade_ssss':
|
||||||
return _t('Upgrade');
|
return _t('Upgrade');
|
||||||
case 'verify_this_session':
|
case 'verify_this_session':
|
||||||
return _t('Verify');
|
return _t('Verify');
|
||||||
|
|
Loading…
Reference in a new issue