1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00

Merge pull request #1290 from matrix-org/dbkr/send_is_verified_rel

Fix isVerified returning false
This commit is contained in:
J. Ryan Stinnett
2020-03-30 10:28:51 +01:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -574,9 +574,9 @@ export class DeviceTrustLevel {
* @returns {bool} true if this device is verified via any means * @returns {bool} true if this device is verified via any means
*/ */
isVerified() { isVerified() {
return this.isLocallyVerified() || ( return Boolean(this.isLocallyVerified() || (
this._trustCrossSignedDevices && this.isCrossSigningVerified() this._trustCrossSignedDevices && this.isCrossSigningVerified()
); ));
} }
/** /**

View File

@@ -1097,7 +1097,7 @@ Crypto.prototype._checkDeviceInfoTrust = function(userId, device) {
userCrossSigning, device, trustedLocally, trustCrossSig, userCrossSigning, device, trustedLocally, trustCrossSig,
); );
} else { } else {
return new DeviceTrustLevel(false, false, trustedLocally); return new DeviceTrustLevel(false, false, trustedLocally, false);
} }
}; };