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

check if there is already a request in progress when clicking verify

Browse source 
and go straight there instead of first showing EncryptionInfo panel
This commit is contained in:
Bruno Windels 2020-02-13 14:34:44 +01:00
parent 68197a1d18
commit 4b7cc12daa
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/right_panel/UserInfo.js
View file

@ -25,7 +25,7 @@ import dis from '../../../dispatcher';
import Modal from '../../../Modal'; import Modal from '../../../Modal';
import * as sdk from '../../../index'; import * as sdk from '../../../index';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import createRoom from '../../../createRoom'; import createRoom, {findDMForUser} from '../../../createRoom';
import DMRoomMap from '../../../utils/DMRoomMap'; import DMRoomMap from '../../../utils/DMRoomMap';
import AccessibleButton from '../elements/AccessibleButton'; import AccessibleButton from '../elements/AccessibleButton';
import SdkConfig from '../../../SdkConfig'; import SdkConfig from '../../../SdkConfig';
@ -169,10 +169,19 @@ async function verifyDevice(userId, device) {
} }
function verifyUser(user) { function verifyUser(user) {
const cli = MatrixClientPeg.get();
const dmRoom = findDMForUser(cli, user.userId);
let existingRequest;
if (dmRoom) {
existingRequest = cli.findVerificationRequestDMInProgress(dmRoom.roomId);
}
dis.dispatch({ dis.dispatch({
action: "set_right_panel_phase", action: "set_right_panel_phase",
phase: RIGHT_PANEL_PHASES.EncryptionPanel, phase: RIGHT_PANEL_PHASES.EncryptionPanel,
refireParams: {member: user}, refireParams: {
member: user,
verificationRequest: existingRequest,
},
}); });
} }

14
src/createRoom.js
View file

@ -159,7 +159,7 @@ export default function createRoom(opts) {
}); });
} }
export async function ensureDMExists(client, userId) { export function findDMForUser(client, userId) {
const roomIds = DMRoomMap.shared().getDMRoomsForUserId(userId); const roomIds = DMRoomMap.shared().getDMRoomsForUserId(userId);
const rooms = roomIds.map(id => client.getRoom(id)); const rooms = roomIds.map(id => client.getRoom(id));
const suitableDMRooms = rooms.filter(r => { const suitableDMRooms = rooms.filter(r => {
@ -169,10 +169,16 @@ export async function ensureDMExists(client, userId) {
} }
return false; return false;
}); });
let roomId;
if (suitableDMRooms.length) { if (suitableDMRooms.length) {
const room = suitableDMRooms[0]; return suitableDMRooms[0];
roomId = room.roomId; }
}
export async function ensureDMExists(client, userId) {
const existingDMRoom = findDMForUser(client, userId);
let roomId;
if (existingDMRoom) {
roomId = existingDMRoom.roomId;
} else { } else {
roomId = await createRoom({dmUserId: userId, spinner: false, andView: false}); roomId = await createRoom({dmUserId: userId, spinner: false, andView: false});
} }