From 9dd81216fb6678fa48d651c1e1d859ea56b9f5ef Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 25 Mar 2020 14:21:17 +0000
Subject: [PATCH] rename secret storage force-reset variable to avoid confusion
---
src/CrossSigningManager.js | 8 ++++----
src/components/views/settings/CrossSigningPanel.js | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 5c254bbd00..f5a6663dfd 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -195,19 +195,19 @@ export async function promptForBackupPassphrase() {
*
* @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
+ * @param {bool} [forceReset] Reset secret storage even if it's already set up
*/
-export async function accessSecretStorage(func = async () => { }, force = false) {
+export async function accessSecretStorage(func = async () => { }, forceReset = false) {
const cli = MatrixClientPeg.get();
secretStorageBeingAccessed = true;
try {
- if (!await cli.hasSecretStorageKey() || force) {
+ if (!await cli.hasSecretStorageKey() || forceReset) {
// This dialog calls bootstrap itself after guiding the user through
// passphrase creation.
const { finished } = Modal.createTrackedDialogAsync('Create Secret Storage dialog', '',
import("./async-components/views/dialogs/secretstorage/CreateSecretStorageDialog"),
{
- force,
+ force: forceReset,
},
null, /* priority = */ false, /* static = */ true,
);
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index cf47c797fc..649ca4a950 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -98,12 +98,12 @@ 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
+ * @param {bool} [forceReset] Bootstrap again even if keys already present
*/
- _bootstrapSecureSecretStorage = async (force=false) => {
+ _bootstrapSecureSecretStorage = async (forceReset=false) => {
this.setState({ error: null });
try {
- await accessSecretStorage(() => undefined, force);
+ await accessSecretStorage(() => undefined, forceReset);
} catch (e) {
this.setState({ error: e });
console.error("Error bootstrapping secret storage", e);