mirror of
https://github.com/vector-im/hydrogen-web.git
synced 2024-12-23 03:25:12 +01:00
Fix key backup setup failing
This commit is contained in:
parent
b4805ab862
commit
f8c5878a01
@ -111,7 +111,8 @@ export class Session {
|
|||||||
this._createRoomEncryption = this._createRoomEncryption.bind(this);
|
this._createRoomEncryption = this._createRoomEncryption.bind(this);
|
||||||
this._forgetArchivedRoom = this._forgetArchivedRoom.bind(this);
|
this._forgetArchivedRoom = this._forgetArchivedRoom.bind(this);
|
||||||
this.needsKeyBackup = new ObservableValue(false);
|
this.needsKeyBackup = new ObservableValue(false);
|
||||||
this.secretFetcher = new SecretFetcher();
|
this._secretFetcher = new SecretFetcher();
|
||||||
|
this._secretSharing = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
get fingerprintKey() {
|
get fingerprintKey() {
|
||||||
@ -213,7 +214,7 @@ export class Session {
|
|||||||
crossSigning: this._crossSigning,
|
crossSigning: this._crossSigning,
|
||||||
logger: this._platform.logger,
|
logger: this._platform.logger,
|
||||||
});
|
});
|
||||||
this.secretFetcher.setSecretSharing(this._secretSharing);
|
this._secretFetcher.setSecretSharing(this._secretSharing);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -349,8 +350,8 @@ export class Session {
|
|||||||
log.set("isValid", isValid);
|
log.set("isValid", isValid);
|
||||||
if (isValid) {
|
if (isValid) {
|
||||||
this._secretStorage = secretStorage;
|
this._secretStorage = secretStorage;
|
||||||
await this._loadSecretStorageService(log);
|
await this._loadSecretStorageServices(secretStorage, log);
|
||||||
this.secretFetcher.setSecretStorage(secretStorage);
|
this._secretFetcher.setSecretStorage(secretStorage);
|
||||||
}
|
}
|
||||||
return isValid;
|
return isValid;
|
||||||
});
|
});
|
||||||
@ -396,6 +397,10 @@ export class Session {
|
|||||||
return this._crossSigning;
|
return this._crossSigning;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get secretSharing() {
|
||||||
|
return this._secretSharing;
|
||||||
|
}
|
||||||
|
|
||||||
get hasIdentity() {
|
get hasIdentity() {
|
||||||
return !!this._e2eeAccount;
|
return !!this._e2eeAccount;
|
||||||
}
|
}
|
||||||
@ -590,7 +595,7 @@ export class Session {
|
|||||||
const crossSigning = new CrossSigning({
|
const crossSigning = new CrossSigning({
|
||||||
storage: this._storage,
|
storage: this._storage,
|
||||||
// secretStorage: this._secretStorage,
|
// secretStorage: this._secretStorage,
|
||||||
secretFetcher: this.secretFetcher,
|
secretFetcher: this._secretFetcher,
|
||||||
platform: this._platform,
|
platform: this._platform,
|
||||||
olm: this._olm,
|
olm: this._olm,
|
||||||
olmUtil: this._olmUtil,
|
olmUtil: this._olmUtil,
|
||||||
|
Loading…
Reference in New Issue
Block a user