Merge pull request #1289 from matrix-org/dbkr/send_is_verified

Fix isVerified returning false
This commit is contained in:
David Baker
2020-03-27 14:28:47 +00:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -574,9 +574,9 @@ export class DeviceTrustLevel {
* @returns {bool} true if this device is verified via any means
*/
isVerified() {
return this.isLocallyVerified() || (
return Boolean(this.isLocallyVerified() || (
this._trustCrossSignedDevices && this.isCrossSigningVerified()
);
));
}
/**
+1 -1
View File
@@ -1097,7 +1097,7 @@ Crypto.prototype._checkDeviceInfoTrust = function(userId, device) {
userCrossSigning, device, trustedLocally, trustCrossSig,
);
} else {
return new DeviceTrustLevel(false, false, trustedLocally);
return new DeviceTrustLevel(false, false, trustedLocally, false);
}
};