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

Combine cross signing and verification over DM feature flags

Browse source 
This means we can just make the new member info panel support
cross-signing exclusively rather than having to try & make it
temporarily support both
This commit is contained in:
David Baker 2019-12-19 15:23:32 +00:00
parent f30e919f9e
commit 3d8422c88a
4 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/MatrixChat.js
View file

@ -1466,7 +1466,7 @@ export default createReactClass({
} }
}); });
if (SettingsStore.isFeatureEnabled("feature_dm_verification")) { if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
cli.on("crypto.verification.request", request => { cli.on("crypto.verification.request", request => {
let requestObserver; let requestObserver;
if (request.event.getRoomId()) { if (request.event.getRoomId()) {

4
src/components/structures/RightPanel.js
View file

@ -190,7 +190,7 @@ export default class RightPanel extends React.Component {
} else if (this.state.phase === RIGHT_PANEL_PHASES.GroupRoomList) { } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupRoomList) {
panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />; panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
} else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) { } else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
if (SettingsStore.isFeatureEnabled("feature_dm_verification")) { if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
const onClose = () => { const onClose = () => {
dis.dispatch({ dis.dispatch({
action: "view_user", action: "view_user",
@ -209,7 +209,7 @@ export default class RightPanel extends React.Component {
} else if (this.state.phase === RIGHT_PANEL_PHASES.Room3pidMemberInfo) { } else if (this.state.phase === RIGHT_PANEL_PHASES.Room3pidMemberInfo) {
panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />; panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />;
} else if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) { } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
if (SettingsStore.isFeatureEnabled("feature_dm_verification")) { if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
const onClose = () => { const onClose = () => {
dis.dispatch({ dis.dispatch({
action: "view_user", action: "view_user",

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 client = MatrixClientPeg.get();
const verifyingOwnDevice = this.props.userId === client.getUserId(); const verifyingOwnDevice = this.props.userId === client.getUserId();
try { try {
if (!verifyingOwnDevice && SettingsStore.getValue("feature_dm_verification")) { if (!verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) {
const roomId = await ensureDMExistsAndOpen(this.props.userId); const roomId = await ensureDMExistsAndOpen(this.props.userId);
// throws upon cancellation before having started // throws upon cancellation before having started
this._verifier = await client.requestVerificationDM( this._verifier = await client.requestVerificationDM(

7
src/settings/Settings.js
View file

@ -136,13 +136,6 @@ export const SETTINGS = {
supportedLevels: ['account'], supportedLevels: ['account'],
default: null, default: null,
}, },
"feature_dm_verification": {
isFeature: true,
displayName: _td("Send verification requests in direct message," +
" including a new verification UX in the member panel."),
supportedLevels: LEVELS_FEATURE,
default: false,
},
"feature_cross_signing": { "feature_cross_signing": {
isFeature: true, isFeature: true,
displayName: _td("Enable cross-signing to verify per-user instead of per-device (in development)"), displayName: _td("Enable cross-signing to verify per-user instead of per-device (in development)"),