Merge pull request #4348 from matrix-org/travis/jitsi/wellknown
Support Jitsi information from client .well-known
This commit is contained in:
commit
234f3ee772
3 changed files with 79 additions and 2 deletions
|
@ -40,6 +40,7 @@ import ToastStore from "./stores/ToastStore";
|
|||
import {IntegrationManagers} from "./integrations/IntegrationManagers";
|
||||
import {Mjolnir} from "./mjolnir/Mjolnir";
|
||||
import DeviceListener from "./DeviceListener";
|
||||
import {Jitsi} from "./widgets/Jitsi";
|
||||
|
||||
/**
|
||||
* Called at startup, to attempt to build a logged-in Matrix session. It tries
|
||||
|
@ -606,6 +607,9 @@ async function startMatrixClient(startSyncing=true) {
|
|||
Presence.start();
|
||||
}
|
||||
|
||||
// Now that we have a MatrixClientPeg, update the Jitsi info
|
||||
await Jitsi.getInstance().update();
|
||||
|
||||
// dispatch that we finished starting up to wire up any other bits
|
||||
// of the matrix client that cannot be set prior to starting up.
|
||||
dis.dispatch({action: 'client_started'});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue