File tree 4 files changed +1
-52
lines changed
4 files changed +1
-52
lines changed Original file line number Diff line number Diff line change @@ -23,11 +23,6 @@ declare global {
23
23
webkitFullscreenElement : HTMLElement | null ;
24
24
}
25
25
26
- interface Window {
27
- // TODO: https://gitlab.matrix.org/matrix-org/olm/-/issues/10
28
- OLM_OPTIONS : Record < string , string > ;
29
- }
30
-
31
26
interface HTMLElement {
32
27
// Safari only supports this prefixed, so tell the type system about it
33
28
webkitRequestFullscreen : ( ) => void ;
Original file line number Diff line number Diff line change @@ -32,8 +32,6 @@ enum LoadState {
32
32
}
33
33
34
34
class DependencyLoadStates {
35
- // TODO: decide where olm should be initialized (see TODO comment below)
36
- // olm: LoadState = LoadState.None;
37
35
public config : LoadState = LoadState . None ;
38
36
public sentry : LoadState = LoadState . None ;
39
37
public openTelemetry : LoadState = LoadState . None ;
@@ -128,18 +126,6 @@ export class Initializer {
128
126
private loadStates = new DependencyLoadStates ( ) ;
129
127
130
128
private initStep ( resolve : ( value : void | PromiseLike < void > ) => void ) : void {
131
- // TODO: Olm is initialized with the client currently (see `initClient()` and `olm.ts`)
132
- // we need to decide if we want to init it here or keep it in initClient
133
- // if (this.loadStates.olm === LoadState.None) {
134
- // this.loadStates.olm = LoadState.Loading;
135
- // // TODO: https://gitlab.matrix.org/matrix-org/olm/-/issues/10
136
- // window.OLM_OPTIONS = {};
137
- // Olm.init({ locateFile: () => olmWasmPath }).then(() => {
138
- // this.loadStates.olm = LoadState.Loaded;
139
- // this.initStep(resolve);
140
- // });
141
- // }
142
-
143
129
// config
144
130
if ( this . loadStates . config === LoadState . None ) {
145
131
this . loadStates . config = LoadState . Loading ;
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -34,7 +34,6 @@ import type { MatrixClient } from "matrix-js-sdk/src/client";
34
34
import type { Room } from "matrix-js-sdk/src/models/room" ;
35
35
import IndexedDBWorker from "../IndexedDBWorker?worker" ;
36
36
import { generateUrlSearchParams , getUrlParams } from "../UrlParams" ;
37
- import { loadOlm } from "../olm" ;
38
37
import { Config } from "../config/Config" ;
39
38
import { E2eeType } from "../e2ee/e2eeType" ;
40
39
import { EncryptionSystem , saveKeyForRoom } from "../e2ee/sharedKeyManagement" ;
@@ -97,8 +96,6 @@ export async function initClient(
97
96
clientOptions : ICreateClientOpts ,
98
97
restore : boolean ,
99
98
) : Promise < MatrixClient > {
100
- await loadOlm ( ) ;
101
-
102
99
let indexedDB : IDBFactory | undefined ;
103
100
try {
104
101
indexedDB = window . indexedDB ;
@@ -198,7 +195,7 @@ export async function initClient(
198
195
await client . store . startup ( ) ;
199
196
}
200
197
201
- await client . initCrypto ( ) ;
198
+ await client . initRustCrypto ( ) ;
202
199
client . setGlobalErrorOnUnknownDevices ( false ) ;
203
200
// Once startClient is called, syncs are run asynchronously.
204
201
// Also, sync completion is communicated only via events.
You can’t perform that action at this time.
0 commit comments