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

Merge pull request #4605 from matrix-org/t3chguy/e2eedefault

Browse source 
Add .well-known option to control default e2ee behaviour
This commit is contained in:
Michael Telatynski 2020-06-03 22:12:13 +01:00 • committed by GitHub
commit eccacb1bc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 136 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Lifecycle.js
View file

@ -622,7 +622,7 @@ async function startMatrixClient(startSyncing=true) {
}
// Now that we have a MatrixClientPeg, update the Jitsi info
await Jitsi.getInstance().update();
await Jitsi.getInstance().start();
// dispatch that we finished starting up to wire up any other bits
// of the matrix client that cannot be set prior to starting up.