From 2e00968bcdbcd85b69eabf0b543c310c9c7c0135 Mon Sep 17 00:00:00 2001
From: Robert Swain <rob@matrix.org>
Date: Fri, 18 Aug 2017 17:44:33 +0200
Subject: [PATCH 1/3] AppPermission: Note that apps are not E2E encrypted in
 E2E rooms

---
 src/components/views/elements/AppPermission.js | 8 ++++++++
 src/components/views/elements/AppTile.js       | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 083a7cd9c7..2b940133e9 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -47,6 +47,11 @@ export default class AppPermission extends React.Component {
     }
 
     render() {
+        let e2eWarningText;
+        if (this.props.isRoomEncrypted) {
+            e2eWarningText =
+                <span className='mx_AppPermissionWarningTextLabel'>NOTE: Apps are not end-to-end encrypted</span>;
+        }
         return (
             <div className='mx_AppPermissionWarning'>
                 <div className='mx_AppPermissionWarningImage'>
@@ -54,6 +59,7 @@ export default class AppPermission extends React.Component {
                 </div>
                 <div className='mx_AppPermissionWarningText'>
                     <span className='mx_AppPermissionWarningTextLabel'>Do you want to load widget from URL:</span> <span className='mx_AppPermissionWarningTextURL'>{this.state.curlBase}</span>
+                    {e2eWarningText}
                 </div>
                 <input
                     className='mx_AppPermissionButton'
@@ -67,9 +73,11 @@ export default class AppPermission extends React.Component {
 }
 
 AppPermission.propTypes = {
+    isRoomEncrypted: PropTypes.bool,
     url: PropTypes.string.isRequired,
     onPermissionGranted: PropTypes.func.isRequired,
 };
 AppPermission.defaultProps = {
+    isRoomEncrypted: false,
     onPermissionGranted: function() {},
 };
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index a411e1d6f6..0dd051ba33 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -251,9 +251,11 @@ export default React.createClass({
                 );
             }
         } else {
+            const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
             appTileBody = (
                 <div className="mx_AppTileBody">
                     <AppPermission
+                        isRoomEncrypted={isRoomEncrypted}
                         url={this.state.widgetUrl}
                         onPermissionGranted={this._grantWidgetPermission}
                     />

From 70824960ee6b7618409031161db3c97629b9cad4 Mon Sep 17 00:00:00 2001
From: Robert Swain <rob@matrix.org>
Date: Mon, 21 Aug 2017 10:23:55 +0200
Subject: [PATCH 2/3] AppPermission: Make strings translatable

---
 src/components/views/elements/AppPermission.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 2b940133e9..3dc7e86d75 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -50,7 +50,7 @@ export default class AppPermission extends React.Component {
         let e2eWarningText;
         if (this.props.isRoomEncrypted) {
             e2eWarningText =
-                <span className='mx_AppPermissionWarningTextLabel'>NOTE: Apps are not end-to-end encrypted</span>;
+                <span className='mx_AppPermissionWarningTextLabel'>{_t('NOTE: Apps are not end-to-end encrypted')}</span>;
         }
         return (
             <div className='mx_AppPermissionWarning'>
@@ -58,7 +58,7 @@ export default class AppPermission extends React.Component {
                     <img src='img/warning.svg' alt={_t('Warning!')}/>
                 </div>
                 <div className='mx_AppPermissionWarningText'>
-                    <span className='mx_AppPermissionWarningTextLabel'>Do you want to load widget from URL:</span> <span className='mx_AppPermissionWarningTextURL'>{this.state.curlBase}</span>
+                    <span className='mx_AppPermissionWarningTextLabel'>{_t('Do you want to load widget from URL:')}</span> <span className='mx_AppPermissionWarningTextURL'>{this.state.curlBase}</span>
                     {e2eWarningText}
                 </div>
                 <input

From 38720e6216e48d9229c5b1b8cea254534e21ce15 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 21 Aug 2017 10:05:16 +0100
Subject: [PATCH 3/3] Add internationlisation.

---
 src/i18n/strings/en_EN.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c3ac9e7023..a2c9b99822 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -264,6 +264,7 @@
     "Disinvite": "Disinvite",
     "Display name": "Display name",
     "Displays action": "Displays action",
+    "Do you want to load widget from URL:": "Do you want to load widget from URL:",
     "Don't send typing notifications": "Don't send typing notifications",
     "Download %(text)s": "Download %(text)s",
     "Drop File Here": "Drop File Here",
@@ -433,6 +434,7 @@
     "AM": "AM",
     "PM": "PM",
     "NOT verified": "NOT verified",
+    "NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted",
     "No devices with registered encryption keys": "No devices with registered encryption keys",
     "No display name": "No display name",
     "No more results": "No more results",