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

Do not show alarming red shields on large encrypted rooms for your own device

Browse source 
Fixes: https://github.com/vector-im/riot-web/issues/12214
This commit is contained in:
Zoe 2020-02-03 16:51:36 +00:00
parent f0d306b07c
commit 41f4b38fe8
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -811,7 +811,9 @@ export default createReactClass({
debuglog("e2e verified", verified, "unverified", unverified); debuglog("e2e verified", verified, "unverified", unverified);
/* Check all verified user devices. */ /* 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 devices = await cli.getStoredDevicesForUser(userId);
const anyDeviceNotVerified = devices.some(({deviceId}) => { const anyDeviceNotVerified = devices.some(({deviceId}) => {
return !cli.checkDeviceTrust(userId, deviceId).isVerified(); return !cli.checkDeviceTrust(userId, deviceId).isVerified();

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

@ -166,7 +166,9 @@ export default createReactClass({
}); });
/* Check all verified user devices. */ /* 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 devices = await cli.getStoredDevicesForUser(userId);
const allDevicesVerified = devices.every(({deviceId}) => { const allDevicesVerified = devices.every(({deviceId}) => {
return cli.checkDeviceTrust(userId, deviceId).isVerified(); return cli.checkDeviceTrust(userId, deviceId).isVerified();