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

Show EncryptionPanel straight away when there is an ongoing verification request for a user

Browse source
This commit is contained in:
Bruno Windels 2020-03-26 17:31:31 +01:00
parent 053a5a5ff4
commit abf12a3ddf
2 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/verification.js
View file

@ -111,12 +111,7 @@ export async function verifyUser(user) {
if (!await enable4SIfNeeded()) {
return;
}
const cli = MatrixClientPeg.get();
const dmRoom = findDMForUser(cli, user.userId);
let existingRequest;
if (dmRoom) {
existingRequest = cli.findVerificationRequestDMInProgress(dmRoom.roomId);
}
const existingRequest = pendingVerificationRequestForUser(user);
dis.dispatch({
action: "set_right_panel_phase",
phase: RIGHT_PANEL_PHASES.EncryptionPanel,
@ -126,3 +121,11 @@ export async function verifyUser(user) {
},
});
}
export function pendingVerificationRequestForUser(user) {
const cli = MatrixClientPeg.get();
const dmRoom = findDMForUser(cli, user.userId);
if (dmRoom) {
return cli.findVerificationRequestDMInProgress(dmRoom.roomId);
}
}