imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3753 from matrix-org/dbkr/combine_cross_sig_dm_verif_feature_flags

Browse source 
Combine cross signing and verification over DM feature flags
This commit is contained in:
David Baker 2019-12-19 17:27:41 +00:00 • committed by GitHub
commit 290df9f50e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/dialogs/DeviceVerifyDialog.js
View file

@ -97,7 +97,7 @@ export default class DeviceVerifyDialog extends React.Component {
const client = MatrixClientPeg.get();
const verifyingOwnDevice = this.props.userId === client.getUserId();
try {
if (!verifyingOwnDevice && SettingsStore.getValue("feature_dm_verification")) {
if (!verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) {
const roomId = await ensureDMExistsAndOpen(this.props.userId);
// throws upon cancellation before having started
this._verifier = await client.requestVerificationDM(