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

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