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

Merge branch 'develop' into new-guest-access

Browse source
This commit is contained in:
Matthew Hodgson 2017-05-30 21:05:07 +01:00
commit e30e45a82c
57 changed files with 1866 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Lifecycle.js
View file

@ -19,6 +19,7 @@ import q from 'q';
import Matrix from 'matrix-js-sdk';
import MatrixClientPeg from './MatrixClientPeg';
import Analytics from './Analytics';
import Notifier from './Notifier';
import UserActivity from './UserActivity';
import Presence from './Presence';
@ -284,6 +285,8 @@ export function initRtsClient(url) {
export function setLoggedIn(credentials) {
credentials.guest = Boolean(credentials.guest);
Analytics.setGuest(credentials.guest);
console.log(
"setLoggedIn: mxid:", credentials.userId,
"deviceId:", credentials.deviceId,
@ -421,6 +424,7 @@ export function onLoggedOut() {
}
function _clearLocalStorage() {
Analytics.logout();
if (!window.localStorage) {
return;
}