Add a flag to control whether cross-signing signatures are trusted

Fixes: https://github.com/vector-im/riot-web/issues/12616

src/components/views/rooms/MemberTile.js

@@ -65,6 +65,7 @@ export default createReactClass({
                 });
                 if (isRoomEncrypted) {
                     cli.on("userTrustStatusChanged", this.onUserTrustStatusChanged);
+                    cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
                     this.updateE2EStatus();
                 } else {
                     // Listen for room to become encrypted
@@ -88,6 +89,7 @@ export default createReactClass({
         if (cli) {
             cli.removeListener("RoomState.events", this.onRoomStateEvents);
             cli.removeListener("userTrustStatusChanged", this.onUserTrustStatusChanged);
+            cli.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
         }
     },
 
@@ -110,6 +112,11 @@ export default createReactClass({
         this.updateE2EStatus();
     },
 
+    onDeviceVerificationChanged: function(userId, deviceId, deviceInfo) {
+        if (userId !== this.props.member.userId) return;
+        this.updateE2EStatus();
+    },
+
     updateE2EStatus: async function() {
         const cli = MatrixClientPeg.get();
         const { userId } = this.props.member;

src/components/views/settings/tabs/user/SecurityUserSettingsTab.js

@@ -281,6 +281,8 @@ export default class SecurityUserSettingsTab extends React.Component {
             );
         }
 
+        const E2eAdvancedPanel = sdk.getComponent('views.settings.E2eAdvancedPanel');
+
         return (
             <div className="mx_SettingsTab mx_SecurityUserSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
@@ -311,6 +313,7 @@ export default class SecurityUserSettingsTab extends React.Component {
                 </div>
                 {this._renderIgnoredUsers()}
                 {this._renderManageInvites()}
+                <E2eAdvancedPanel />
             </div>
         );
     }