Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Remove deprecated calls to client#hasSecretStorageKey #12112

Closed
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
jslint
  • Loading branch information
BillCarsonFr committed Jan 3, 2024
commit d5a227ca8621820b062e883cf76a985eff28592b
8 changes: 2 additions & 6 deletions playwright/e2e/crypto/backups.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,10 @@ import { type Page } from "@playwright/test";
import { test, expect } from "../../element-web-test";

async function expectBackupVersionToBe(page: Page, version: string) {
const serverVersion = await page
.locator(".mx_SecureBackupPanel_statusList tr:nth-child(5) td")
.textContent();
const serverVersion = await page.locator(".mx_SecureBackupPanel_statusList tr:nth-child(5) td").textContent();
expect(serverVersion.trim()).toBe(version + " (Algorithm: m.megolm_backup.v1.curve25519-aes-sha2)");

const activeVersion = await page
.locator(".mx_SecureBackupPanel_statusList tr:nth-child(6) td")
.textContent();
const activeVersion = await page.locator(".mx_SecureBackupPanel_statusList tr:nth-child(6) td").textContent();
expect(activeVersion.trim()).toBe(version);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { logger } from "matrix-js-sdk/src/logger";

import { MatrixClientPeg } from "../../../../MatrixClientPeg";
import { _t } from "../../../../languageHandler";
import {accessSecretStorage, withSecretStorageKeyCache} from "../../../../SecurityManager";
import { accessSecretStorage, withSecretStorageKeyCache } from "../../../../SecurityManager";
import Spinner from "../../../../components/views/elements/Spinner";
import BaseDialog from "../../../../components/views/dialogs/BaseDialog";
import DialogButtons from "../../../../components/views/elements/DialogButtons";
Expand Down Expand Up @@ -76,7 +76,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent<IProps, I
});
const cli = MatrixClientPeg.safeGet();
try {
// Check if 4S already setup
// Check if 4S already set up
const secretStorageAlreadySetup = await cli.hasSecretStorageKey();

if (!secretStorageAlreadySetup) {
Expand Down