From f0224460d2e0885dbf6124fc630066cbd90189c9 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 1 Aug 2017 17:48:02 +0100
Subject: [PATCH] Fix comparison and handle case where app has permission to
 load but content is mixed protocol.

---
 src/components/views/elements/AppTile.js | 38 +++++++++++++-----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 1119cf0387..2aebc217f5 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -209,24 +209,26 @@ export default React.createClass({
                 </div>
             );
         } else if (this.state.hasPermissionToLoad == true) {
-            appTileBody = (
-                <div className="mx_AppTileBody">
-                    <iframe
-                        ref="appFrame"
-                        src={safeWidgetUrl}
-                        allowFullScreen="true"
-                        sandbox={sandboxFlags}
-                    ></iframe>
-                </div>
-            );
-        } else if (this.isMixedContent()) {
-            appTileBody = (
-                <div className="mx_AppTileBody">
-                    <AppWarning
-                        errorMsg="Error - Mixed content"
-                    />
-                </div>
-            );
+            if (this.isMixedContent()) {
+                appTileBody = (
+                    <div className="mx_AppTileBody">
+                        <AppWarning
+                            errorMsg="Error - Mixed content"
+                        />
+                    </div>
+                );
+            } else {
+                appTileBody = (
+                    <div className="mx_AppTileBody">
+                        <iframe
+                            ref="appFrame"
+                            src={safeWidgetUrl}
+                            allowFullScreen="true"
+                            sandbox={sandboxFlags}
+                        ></iframe>
+                    </div>
+                );
+            }
         } else {
             appTileBody = (
                 <div className="mx_AppTileBody">