From 13a4f4190f16303f9e3c935297f400e405ea0164 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 11 Mar 2020 10:11:54 +0100
Subject: [PATCH] Revert "also enable 4s when accepting a verification request"

This reverts commit ab2e3a346599a4f092d43dc8d2de94954ac34f88.
---
 src/components/views/toasts/VerificationRequestToast.js | 4 ----
 src/verification.js                                     | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index f590cecc3e..c11cefc839 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -24,7 +24,6 @@ import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver
 import dis from "../../../dispatcher";
 import ToastStore from "../../../stores/ToastStore";
 import Modal from "../../../Modal";
-import {enable4SIfNeeded} from "../../../verification";
 
 export default class VerificationRequestToast extends React.PureComponent {
     constructor(props) {
@@ -74,9 +73,6 @@ export default class VerificationRequestToast extends React.PureComponent {
     }
 
     accept = async () => {
-        if (!await enable4SIfNeeded()) {
-            return;
-        }
         ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         const {request} = this.props;
         // no room id for to_device requests
diff --git a/src/verification.js b/src/verification.js
index 235828dc92..6f1bb07344 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -24,7 +24,7 @@ import {findDMForUser} from './createRoom';
 import {accessSecretStorage} from './CrossSigningManager';
 import SettingsStore from './settings/SettingsStore';
 
-export async function enable4SIfNeeded() {
+async function enable4SIfNeeded() {
     const cli = MatrixClientPeg.get();
     if (!cli.isCryptoEnabled() || !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
         return false;