From 9c5c5e282b619a726af57b0f3207d80451b2dff8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 11 May 2018 18:06:58 +0100
Subject: [PATCH] Send visibility only when changed, and messaging is available

---
 src/components/views/elements/AppTile.js    |  7 +------
 src/components/views/rooms/Stickerpicker.js | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index b345adcc1d..cd0eb1ce68 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -172,12 +172,7 @@ export default class AppTile extends React.Component {
     componentDidUpdate() {
         // Allow parents to access widget messaging
         if (this.props.collectWidgetMessaging) {
-            this.props.collectWidgetMessaging(new Promise((resolve) => {
-                if (this.widgetMessaging) resolve(this.widgetMessaging);
-
-                // Expect this to be resolved later
-                this._exposeWidgetMessaging = resolve;
-            }));
+            this.props.collectWidgetMessaging(this.widgetMessaging);
         }
     }
 
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 0bdf5fe5df..40ce6e6b39 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -105,11 +105,7 @@ export default class Stickerpicker extends React.Component {
     }
 
     componentDidUpdate(prevProps, prevState) {
-        if (this._appWidgetMessaging &&
-            prevState.showStickers !== this.state.showStickers
-        ) {
-            this._appWidgetMessaging.sendVisibility(this.state.showStickers);
-        }
+        this._sendVisibilityToWidget(this.state.showStickers);
     }
 
     _imError(errorMsg, e) {
@@ -147,10 +143,19 @@ export default class Stickerpicker extends React.Component {
         );
     }
 
-    async _collectWidgetMessaging(prom) {
-        const widgetMessaging = await prom;
+    _collectWidgetMessaging(widgetMessaging) {
         this._appWidgetMessaging = widgetMessaging;
-        this._appWidgetMessaging.sendVisibility(true);
+
+        // Do this now instead of in componentDidMount because we might not have had the
+        // reference to widgetMessaging when mounting
+        this._sendVisibilityToWidget(true);
+    }
+
+    _sendVisibilityToWidget(visible) {
+        if (this._appWidgetMessaging && visible !== this._prevSentVisibility) {
+            this._appWidgetMessaging.sendVisibility(visible);
+            this._prevSentVisibility = visible;
+        }
     }
 
     _getStickerpickerContent() {