PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1772 from matrix-org/luke/fix-unverified-device-blacklist2

Browse source 
Fix bug where global "Never send to unverified..." is ignored
This commit is contained in:
David Baker 2018-02-23 10:12:16 +00:00 committed by GitHub
commit 6efb3abba4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Lifecycle.js
View file

@ -362,7 +362,7 @@ async function _doSetLoggedIn(credentials, clearStorage) {
dis.dispatch({action: 'on_logged_in', teamToken: teamToken}); dis.dispatch({action: 'on_logged_in', teamToken: teamToken});
}); });
startMatrixClient(); await startMatrixClient();
return MatrixClientPeg.get(); return MatrixClientPeg.get();
} }
@ -423,7 +423,7 @@ export function logout() {
* Starts the matrix client and all other react-sdk services that * Starts the matrix client and all other react-sdk services that
* listen for events while a session is logged in. * listen for events while a session is logged in.
*/ */
function startMatrixClient() { async function startMatrixClient() {
console.log(`Lifecycle: Starting MatrixClient`); console.log(`Lifecycle: Starting MatrixClient`);
// dispatch this before starting the matrix client: it's used // dispatch this before starting the matrix client: it's used
@ -437,7 +437,7 @@ function startMatrixClient() {
Presence.start(); Presence.start();
DMRoomMap.makeShared().start(); DMRoomMap.makeShared().start();
MatrixClientPeg.start(); await MatrixClientPeg.start();
// dispatch that we finished starting up to wire up any other bits // dispatch that we finished starting up to wire up any other bits
// of the matrix client that cannot be set prior to starting up. // of the matrix client that cannot be set prior to starting up.