OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Support rust in StorageManager (#12206)

pull/28788/head^2
Valere 2024-02-01 16:42:14 +01:00 committed by GitHub
parent 01f0c668b7
commit 40ee1bb400
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/MatrixClientPeg.ts
View File

@ -336,6 +336,7 @@ class MatrixClientPegClass implements IMatrixClientPeg {
if (useRustCrypto) { if (useRustCrypto) {
await this.matrixClient.initRustCrypto(); await this.matrixClient.initRustCrypto();
StorageManager.setCryptoInitialised(true);
// TODO: device dehydration and whathaveyou // TODO: device dehydration and whathaveyou
return; return;
} }

16
src/utils/StorageManager.ts
View File

@ -17,6 +17,9 @@ limitations under the License.
import { LocalStorageCryptoStore, IndexedDBStore, IndexedDBCryptoStore } from "matrix-js-sdk/src/matrix"; import { LocalStorageCryptoStore, IndexedDBStore, IndexedDBCryptoStore } from "matrix-js-sdk/src/matrix";
import { logger } from "matrix-js-sdk/src/logger"; import { logger } from "matrix-js-sdk/src/logger";
import SettingsStore from "../settings/SettingsStore";
import { Features } from "../settings/Settings";
const localStorage = window.localStorage; const localStorage = window.localStorage;
// just *accessing* indexedDB throws an exception in firefox with // just *accessing* indexedDB throws an exception in firefox with
@ -28,7 +31,16 @@ try {
// The JS SDK will add a prefix of "matrix-js-sdk:" to the sync store name. // The JS SDK will add a prefix of "matrix-js-sdk:" to the sync store name.
const SYNC_STORE_NAME = "riot-web-sync"; const SYNC_STORE_NAME = "riot-web-sync";
const CRYPTO_STORE_NAME = "matrix-js-sdk:crypto"; const LEGACY_CRYPTO_STORE_NAME = "matrix-js-sdk:crypto";
const RUST_CRYPTO_STORE_NAME = "matrix-js-sdk::matrix-sdk-crypto";
function cryptoStoreName(): string {
if (SettingsStore.getValue(Features.RustCrypto)) {
return RUST_CRYPTO_STORE_NAME;
} else {
return LEGACY_CRYPTO_STORE_NAME;
}
}
function log(msg: string): void { function log(msg: string): void {
logger.log(`StorageManager: ${msg}`); logger.log(`StorageManager: ${msg}`);
@ -145,7 +157,7 @@ async function checkSyncStore(): Promise<StoreCheck> {
async function checkCryptoStore(): Promise<StoreCheck> { async function checkCryptoStore(): Promise<StoreCheck> {
let exists = false; let exists = false;
try { try {
exists = await IndexedDBCryptoStore.exists(indexedDB, CRYPTO_STORE_NAME); exists = await IndexedDBCryptoStore.exists(indexedDB, cryptoStoreName());
log(`Crypto store using IndexedDB contains data? ${exists}`); log(`Crypto store using IndexedDB contains data? ${exists}`);
return { exists, healthy: true }; return { exists, healthy: true };
} catch (e) { } catch (e) {