OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Try and fix the Notifier race 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2020-05-28 19:03:42 +01:00
parent 0242b6f3f3
commit 2530ec8419
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Notifier.js
View File

@ -27,8 +27,7 @@ import { _t } from './languageHandler';
import Modal from './Modal'; import Modal from './Modal';
import SettingsStore, {SettingLevel} from "./settings/SettingsStore"; import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
import { import {
showToast as showNotificationsToast, hideToast as hideNotificationsToast, showToast as showNotificationsToast,
hideToast as hideNotificationsToast,
} from "./toasts/DesktopNotificationsToast"; } from "./toasts/DesktopNotificationsToast";
/* /*
@ -188,10 +187,6 @@ const Notifier = {
MatrixClientPeg.get().on("sync", this.boundOnSyncStateChange); MatrixClientPeg.get().on("sync", this.boundOnSyncStateChange);
this.toolbarHidden = false; this.toolbarHidden = false;
this.isSyncing = false; this.isSyncing = false;
if (this.shouldShowToolbar()) {
showNotificationsToast();
}
}, },
stop: function() { stop: function() {

5
src/components/structures/MatrixChat.tsx
View File

@ -71,6 +71,7 @@ import {
showToast as showAnalyticsToast, showToast as showAnalyticsToast,
hideToast as hideAnalyticsToast hideToast as hideAnalyticsToast
} from "../../toasts/AnalyticsToast"; } from "../../toasts/AnalyticsToast";
import {showToast as showNotificationsToast} from "../../toasts/DesktopNotificationsToast";
/** constants for MatrixChat.state.view */ /** constants for MatrixChat.state.view */
export enum Views { export enum Views {
@ -1364,6 +1365,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
this.firstSyncComplete = true; this.firstSyncComplete = true;
this.firstSyncPromise.resolve(); this.firstSyncPromise.resolve();
if (Notifier.shouldShowToolbar()) {
showNotificationsToast();
}
dis.dispatch({action: 'focus_composer'}); dis.dispatch({action: 'focus_composer'});
this.setState({ this.setState({
ready: true, ready: true,