Merge pull request #1319 from matrix-org/rob/apps-not-e2ee

Note that apps are not E2EE

Author: superdump

src/components/views/elements/AppPermission.js

@@ -47,13 +47,19 @@ export default class AppPermission extends React.Component {
     }
 
     render() {
+        let e2eWarningText;
+        if (this.props.isRoomEncrypted) {
+            e2eWarningText =
+                <span className='mx_AppPermissionWarningTextLabel'>{_t('NOTE: Apps are not end-to-end encrypted')}</span>;
+        }
         return (
             <div className='mx_AppPermissionWarning'>
                 <div className='mx_AppPermissionWarningImage'>
                     <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
                     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() {},
 };

src/components/views/elements/AppTile.js

@@ -252,9 +252,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}
                         />

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",