imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use new getCrossSigningKeyId instead of old getCrossSigningId (#10885)

Browse source 
* Use new `getCrossSigningKeyId` instead of old `getCrossSigningId`

* Fix type error
This commit is contained in:
Richard van der Hoff 2023-05-15 19:30:43 +01:00 • committed by GitHub
parent 77d18f1a43
commit 38c13509fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/verification.ts
View file

@ -18,6 +18,7 @@ import { User } from "matrix-js-sdk/src/models/user";
import { verificationMethods as VerificationMethods } from "matrix-js-sdk/src/crypto";
import { RoomMember } from "matrix-js-sdk/src/matrix";
import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
import { CrossSigningKey } from "matrix-js-sdk/src/crypto-api";
import { MatrixClientPeg } from "./MatrixClientPeg";
import dis from "./dispatcher/dispatcher";
@ -33,10 +34,9 @@ import { findDMForUser } from "./utils/dm/findDMForUser";
async function enable4SIfNeeded(): Promise<boolean> {
const cli = MatrixClientPeg.get();
if (!cli.isCryptoEnabled()) {
return false;
}
const usk = cli.getCrossSigningId("user_signing");
const crypto = cli.getCrypto();
if (!crypto) return false;
const usk = await crypto.getCrossSigningKeyId(CrossSigningKey.UserSigning);
if (!usk) {
await accessSecretStorage();
return false;