mirror of https://github.com/vector-im/riot-web
also enable 4s when accepting a verification request
parent
ddbfe4e1fa
commit
ab2e3a3465
|
@ -24,6 +24,7 @@ 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) {
|
||||
|
@ -73,6 +74,9 @@ 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
|
||||
|
|
|
@ -24,7 +24,7 @@ import {findDMForUser} from './createRoom';
|
|||
import {accessSecretStorage} from './CrossSigningManager';
|
||||
import SettingsStore from './settings/SettingsStore';
|
||||
|
||||
async function enable4SIfNeeded() {
|
||||
export async function enable4SIfNeeded() {
|
||||
const cli = MatrixClientPeg.get();
|
||||
if (!cli.isCryptoEnabled() || !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
|
||||
return false;
|
||||
|
|
Loading…
Reference in New Issue