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

Merge branch 'develop' into feature/padLockInviteOnly

Browse source
This commit is contained in:
Travis Ralston 2020-02-24 09:50:06 -07:00
commit d2e7cc7f19
138 changed files with 4634 additions and 1211 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/rooms/RoomTile.js
View file

@ -166,7 +166,9 @@ export default createReactClass({
});
/* Check all verified user devices. */
for (const userId of [...verified, cli.getUserId()]) {
/* Don't alarm if no other users are verified */
const targets = (verified.length > 0) ? [...verified, cli.getUserId()] : verified;
for (const userId of targets) {
const devices = await cli.getStoredDevicesForUser(userId);
const allDevicesVerified = devices.every(({deviceId}) => {
return cli.checkDeviceTrust(userId, deviceId).isVerified();