OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Revert "enable 4s when accepting a verification request"
pull/21833/head
Bruno Windels 2020-03-11 11:30:15 +00:00 committed by GitHub
parent f9954a668c 13a4f4190f
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 dis from "../../../dispatcher";
import ToastStore from "../../../stores/ToastStore"; import ToastStore from "../../../stores/ToastStore";
import Modal from "../../../Modal"; import Modal from "../../../Modal";
import {enable4SIfNeeded} from "../../../verification";
export default class VerificationRequestToast extends React.PureComponent { export default class VerificationRequestToast extends React.PureComponent {
constructor(props) { constructor(props) {
@ -74,9 +73,6 @@ export default class VerificationRequestToast extends React.PureComponent {
} }
accept = async () => { accept = async () => {
if (!await enable4SIfNeeded()) {
return;
}
ToastStore.sharedInstance().dismissToast(this.props.toastKey); ToastStore.sharedInstance().dismissToast(this.props.toastKey);
const {request} = this.props; const {request} = this.props;
// no room id for to_device requests // 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 {accessSecretStorage} from './CrossSigningManager';
import SettingsStore from './settings/SettingsStore'; import SettingsStore from './settings/SettingsStore';
export async function enable4SIfNeeded() { async function enable4SIfNeeded() {
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
if (!cli.isCryptoEnabled() || !SettingsStore.isFeatureEnabled("feature_cross_signing")) { if (!cli.isCryptoEnabled() || !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
return false; return false;