mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4198 from matrix-org/bwindels/dontenable4swhenacceptingverifreq

Browse source 
Revert "enable 4s when accepting a verification request"
This commit is contained in:
Bruno Windels 2020-03-11 11:30:15 +00:00 committed by GitHub
commit 138e663498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/toasts/VerificationRequestToast.js
View file

@ -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

2
src/verification.js
View file

@ -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;