mirror of
https://github.com/element-hq/element-web
synced 2024-10-25 12:16:00 +03:00
Merge pull request #3949 from matrix-org/foldleft/12079-fix-warnings-on-self
Fix issue where we don't notice if our own devices shouldn't be trusted
This commit is contained in:
commit
06f7842afa
2 changed files with 2 additions and 2 deletions
|
@ -811,7 +811,7 @@ 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) {
|
for (const userId of [...verified, cli.getUserId()]) {
|
||||||
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();
|
||||||
|
|
|
@ -166,7 +166,7 @@ export default createReactClass({
|
||||||
});
|
});
|
||||||
|
|
||||||
/* Check all verified user devices. */
|
/* Check all verified user devices. */
|
||||||
for (const userId of verified) {
|
for (const userId of [...verified, cli.getUserId()]) {
|
||||||
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();
|
||||||
|
|
Loading…
Reference in a new issue