From 73181bc6c16b947f0e188ccb1c84eb3b8cd8ad8b Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 20 Oct 2023 17:49:25 +0100 Subject: [PATCH] Update base64 import Apologies, I broke this with https://github.com/matrix-org/matrix-js-sdk/pull/3818 This fixes it, but needs https://github.com/matrix-org/matrix-js-sdk/pull/3820 --- src/BasePlatform.ts | 3 +-- src/SecurityManager.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts index 496c89c181d..9de3882124f 100644 --- a/src/BasePlatform.ts +++ b/src/BasePlatform.ts @@ -17,8 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixClient, MatrixEvent, Room, SSOAction } from "matrix-js-sdk/src/matrix"; -import { encodeUnpaddedBase64 } from "matrix-js-sdk/src/crypto/olmlib"; +import { MatrixClient, MatrixEvent, Room, SSOAction, encodeUnpaddedBase64 } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import dis from "./dispatcher/dispatcher"; diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts index 58e316651e8..10848e7afb9 100644 --- a/src/SecurityManager.ts +++ b/src/SecurityManager.ts @@ -14,11 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { DeviceVerificationStatus, ICryptoCallbacks, MatrixClient } from "matrix-js-sdk/src/matrix"; +import { DeviceVerificationStatus, ICryptoCallbacks, MatrixClient, encodeBase64 } from "matrix-js-sdk/src/matrix"; import { ISecretStorageKeyInfo } from "matrix-js-sdk/src/crypto/api"; import { deriveKey } from "matrix-js-sdk/src/crypto/key_passphrase"; import { decodeRecoveryKey } from "matrix-js-sdk/src/crypto/recoverykey"; -import { encodeBase64 } from "matrix-js-sdk/src/crypto/olmlib"; import { logger } from "matrix-js-sdk/src/logger"; import type CreateSecretStorageDialog from "./async-components/views/dialogs/security/CreateSecretStorageDialog";