mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 03:25:12 +01:00
Code Issues Projects Releases Wiki Activity

update timestamp when creating a new megolm session

Browse Source
This commit is contained in:
Bruno Windels 2020-11-10 16:17:56 +01:00
parent aa62a5905d
commit de143fdafc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/matrix/e2ee/megolm/Encryption.js
View File

@ -55,7 +55,7 @@ export class Encryption {
let sessionEntry = await txn.outboundGroupSessions.get(roomId); let sessionEntry = await txn.outboundGroupSessions.get(roomId);
roomKeyMessage = this._readOrCreateSession(session, sessionEntry, roomId, encryptionParams, txn); roomKeyMessage = this._readOrCreateSession(session, sessionEntry, roomId, encryptionParams, txn);
if (roomKeyMessage) { if (roomKeyMessage) {
this._writeSession(sessionEntry, session, roomId, txn); this._writeSession(this._now(), session, roomId, txn);
} }
} catch (err) { } catch (err) {
txn.abort(); txn.abort();
@ -85,11 +85,11 @@ export class Encryption {
} }
} }
_writeSession(sessionEntry, session, roomId, txn) { _writeSession(createdAt, session, roomId, txn) {
txn.outboundGroupSessions.set({ txn.outboundGroupSessions.set({
roomId, roomId,
session: session.pickle(this._pickleKey), session: session.pickle(this._pickleKey),
createdAt: sessionEntry?.createdAt || this._now(), createdAt,
}); });
} }
@ -114,7 +114,9 @@ export class Encryption {
let sessionEntry = await txn.outboundGroupSessions.get(roomId); let sessionEntry = await txn.outboundGroupSessions.get(roomId);
roomKeyMessage = this._readOrCreateSession(session, sessionEntry, roomId, encryptionParams, txn); roomKeyMessage = this._readOrCreateSession(session, sessionEntry, roomId, encryptionParams, txn);
encryptedContent = this._encryptContent(roomId, session, type, content); encryptedContent = this._encryptContent(roomId, session, type, content);
this._writeSession(sessionEntry, session, roomId, txn); // update timestamp when a new session is created
const createdAt = roomKeyMessage ? this._now() : sessionEntry.createdAt;
this._writeSession(createdAt, session, roomId, txn);
} catch (err) { } catch (err) {
txn.abort(); txn.abort();