mirror of
https://github.com/vector-im/hydrogen-web.git
synced 2025-02-08 18:48:18 +01:00
Merge branch 'master' into sas-verification
This commit is contained in:
commit
36fe043fbe
@ -496,7 +496,9 @@ export class Session {
|
|||||||
olmWorker: this._olmWorker,
|
olmWorker: this._olmWorker,
|
||||||
txn
|
txn
|
||||||
});
|
});
|
||||||
|
if (this._e2eeAccount) {
|
||||||
log.set("keys", this._e2eeAccount.identityKeys);
|
log.set("keys", this._e2eeAccount.identityKeys);
|
||||||
|
}
|
||||||
this._setupEncryption();
|
this._setupEncryption();
|
||||||
}
|
}
|
||||||
const pendingEventsByRoomId = await this._getPendingEventsByRoom(txn);
|
const pendingEventsByRoomId = await this._getPendingEventsByRoom(txn);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user