Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

make flushing room key shares reentrant

Browse source 
as it can be called from Room.start while still running.
This commit is contained in:
Bruno Windels 2020-09-25 10:45:00 +02:00
parent bcca23bac9
commit 134b04c782
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/matrix/e2ee/RoomEncryption.js
View file

@ -54,6 +54,7 @@ export class RoomEncryption {
this._notifyMissingMegolmSession = notifyMissingMegolmSession; this._notifyMissingMegolmSession = notifyMissingMegolmSession;
this._clock = clock; this._clock = clock;
this._disposed = false; this._disposed = false;
this._isFlushingRoomKeyShares = false;
} }
async enableSessionBackup(sessionBackup) { async enableSessionBackup(sessionBackup) {
@ -321,6 +322,12 @@ export class RoomEncryption {
} }
async flushPendingRoomKeyShares(hsApi, operations = null) { async flushPendingRoomKeyShares(hsApi, operations = null) {
// this has to be reentrant as it can be called from Room.start while still running
if (this._isFlushingRoomKeyShares) {
return;
}
this._isFlushingRoomKeyShares = true;
try {
if (!operations) { if (!operations) {
const txn = await this._storage.readTxn([this._storage.storeNames.operations]); const txn = await this._storage.readTxn([this._storage.storeNames.operations]);
operations = await txn.operations.getAllByTypeAndScope("share_room_key", this._room.id); operations = await txn.operations.getAllByTypeAndScope("share_room_key", this._room.id);
@ -341,6 +348,9 @@ export class RoomEncryption {
} }
await removeTxn.complete(); await removeTxn.complete();
} }
} finally {
this._isFlushingRoomKeyShares = false;
}
} }
async _sendRoomKey(roomKeyMessage, devices, hsApi) { async _sendRoomKey(roomKeyMessage, devices, hsApi) {