diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js index 08ec459f26..3381f3e93b 100644 --- a/src/CrossSigningManager.js +++ b/src/CrossSigningManager.js @@ -115,6 +115,7 @@ export const crossSigningCallbacks = { * * @param {Function} [func] An operation to perform once secret storage has been * bootstrapped. Optional. + * @param {bool} [force] Reset secret storage even if it's already set up */ export async function accessSecretStorage(func = async () => { }, force = false) { const cli = MatrixClientPeg.get(); diff --git a/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js b/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js index 942249e07d..3242afd5f1 100644 --- a/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js +++ b/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js @@ -46,7 +46,7 @@ export default class ConfirmDestroyCrossSigningDialog extends React.Component { "Deleting cross-signing keys is permanent. " + "Anyone you have verified with will see security alerts. " + "You almost certainly don't want to do this, unless " + - "you've lost every device you can cross-sign from." + "you've lost every device you can cross-sign from.", )}

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js index 35f617b83b..77cae79324 100644 --- a/src/components/views/settings/CrossSigningPanel.js +++ b/src/components/views/settings/CrossSigningPanel.js @@ -87,6 +87,7 @@ export default class CrossSigningPanel extends React.PureComponent { * 2. Access existing secret storage by requesting passphrase and accessing * cross-signing keys as needed. * 3. All keys are loaded and there's nothing to do. + * @param {bool} [force] Bootstrap again even if keys already present */ _bootstrapSecureSecretStorage = async (force=false) => { this.setState({ error: null }); @@ -109,7 +110,7 @@ export default class CrossSigningPanel extends React.PureComponent { _destroySecureSecretStorage = () => { const ConfirmDestoryCrossSigningDialog = sdk.getComponent("dialogs.ConfirmDestroyCrossSigningDialog"); Modal.createDialog(ConfirmDestoryCrossSigningDialog, { - onFinished: this.onDestroyStorage + onFinished: this.onDestroyStorage, }); }