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

Merge pull request #5370 from matrix-org/t3chguy/countly

Browse source 
Fix CountlyAnalytics NPE on MatrixClientPeg
This commit is contained in:
Michael Telatynski 2020-10-30 14:28:48 +00:00 • committed by GitHub
commit f80ee391bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Lifecycle.ts
View file

@ -583,7 +583,7 @@ export function logout(): void {
if (!MatrixClientPeg.get()) return; if (!MatrixClientPeg.get()) return;
if (!CountlyAnalytics.instance.disabled) { if (!CountlyAnalytics.instance.disabled) {
// user has logged out, fall back to anonymous // user has logged out, fall back to anonymous
CountlyAnalytics.instance.enable(true); CountlyAnalytics.instance.enable(/* anonymous = */ true);
} }
if (MatrixClientPeg.get().isGuest()) { if (MatrixClientPeg.get().isGuest()) {

8
src/components/structures/MatrixChat.tsx
View file

@ -350,10 +350,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
if (SettingsStore.getValue("analyticsOptIn")) { if (SettingsStore.getValue("analyticsOptIn")) {
Analytics.enable(); Analytics.enable();
CountlyAnalytics.instance.enable(false);
} else {
CountlyAnalytics.instance.enable(true);
} }
CountlyAnalytics.instance.enable(/* anonymous = */ true);
} }
// TODO: [REACT-WARNING] Replace with appropriate lifecycle stage // TODO: [REACT-WARNING] Replace with appropriate lifecycle stage
@ -422,7 +420,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
dis.dispatch({action: "view_welcome_page"}); dis.dispatch({action: "view_welcome_page"});
} }
} else if (SettingsStore.getValue("analyticsOptIn")) { } else if (SettingsStore.getValue("analyticsOptIn")) {
CountlyAnalytics.instance.enable(false); CountlyAnalytics.instance.enable(/* anonymous = */ false);
} }
}); });
// Note we don't catch errors from this: we catch everything within // Note we don't catch errors from this: we catch everything within
@ -762,7 +760,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
Analytics.enable(); Analytics.enable();
} }
if (CountlyAnalytics.instance.canEnable()) { if (CountlyAnalytics.instance.canEnable()) {
CountlyAnalytics.instance.enable(false); CountlyAnalytics.instance.enable(/* anonymous = */ false);
} }
break; break;
case 'reject_cookies': case 'reject_cookies':

2
src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
View file

@ -103,7 +103,7 @@ export default class SecurityUserSettingsTab extends React.Component {
_updateAnalytics = (checked) => { _updateAnalytics = (checked) => {
checked ? Analytics.enable() : Analytics.disable(); checked ? Analytics.enable() : Analytics.disable();
CountlyAnalytics.instance.enable(!checked); CountlyAnalytics.instance.enable(/* anonymous = */ !checked);
}; };
_onExportE2eKeysClicked = () => { _onExportE2eKeysClicked = () => {