PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

only prompt to verify if we have an MSK or we have devices to verify against

Browse source
This commit is contained in:
Matthew Hodgson 2021-03-08 04:49:59 +00:00
parent aa0cca9306
commit d477f964d2
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/stores/SetupEncryptionStore.js
View file

@ -49,6 +49,7 @@ export class SetupEncryptionStore extends EventEmitter {
cli.on("crypto.verification.request", this.onVerificationRequest); cli.on("crypto.verification.request", this.onVerificationRequest);
cli.on('userTrustStatusChanged', this._onUserTrustStatusChanged); cli.on('userTrustStatusChanged', this._onUserTrustStatusChanged);
const requestsInProgress = cli.getVerificationRequestsToDeviceInProgress(cli.getUserId()); const requestsInProgress = cli.getVerificationRequestsToDeviceInProgress(cli.getUserId());
if (requestsInProgress.length) { if (requestsInProgress.length) {
// If there are multiple, we take the most recent. Equally if the user sends another request from // If there are multiple, we take the most recent. Equally if the user sends another request from
@ -75,7 +76,8 @@ export class SetupEncryptionStore extends EventEmitter {
} }
async fetchKeyInfo() { async fetchKeyInfo() {
const keys = await MatrixClientPeg.get().isSecretStored('m.cross_signing.master', false); const cli = MatrixClientPeg.get();
const keys = await cli.isSecretStored('m.cross_signing.master', false);
if (keys === null || Object.keys(keys).length === 0) { if (keys === null || Object.keys(keys).length === 0) {
this.keyId = null; this.keyId = null;
this.keyInfo = null; this.keyInfo = null;
@ -85,7 +87,22 @@ export class SetupEncryptionStore extends EventEmitter {
this.keyInfo = keys[this.keyId]; this.keyInfo = keys[this.keyId];
} }
this.phase = PHASE_INTRO; // do we have any other devices which are E2EE which we can verify against?
const dehydratedDevice = await cli.getDehydratedDevice();
this.hasDevicesToVerifyAgainst = cli.getStoredDevicesForUser(cli.getUserId()).some(
device =>
device.getIdentityKey() &&
(!dehydratedDevice || (device.deviceId != dehydratedDevice.device_id))
);
if (!this.hasDevicesToVerifyAgainst && !this.keyInfo) {
// skip before we can even render anything.
// XXX: this causes a dialog box flash
this.phase = PHASE_FINISHED;
}
else {
this.phase = PHASE_INTRO;
}
this.emit("update"); this.emit("update");
} }