From c6ff4c2517515713a8e8369b90562206a811dc10 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@element.io>
Date: Fri, 6 Nov 2020 18:56:32 +0100
Subject: [PATCH] finish room encryption part

---
 src/matrix/e2ee/RoomEncryption.js    | 22 +++++-----------------
 src/matrix/e2ee/megolm/Encryption.js |  1 -
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/matrix/e2ee/RoomEncryption.js b/src/matrix/e2ee/RoomEncryption.js
index 7d60a475..f10e3f07 100644
--- a/src/matrix/e2ee/RoomEncryption.js
+++ b/src/matrix/e2ee/RoomEncryption.js
@@ -247,22 +247,10 @@ export class RoomEncryption {
     }
 
     /** shares the encryption key for the next message if needed */
-    async ensureNextMessageEncryptionKeyIsShared(hsApi) {
-        const txn = this._storage.readWriteTxn([
-            this._storage.storeNames.operations,
-            this._storage.storeNames.outboundGroupSessions,
-            this._storage.storeNames.inboundGroupSessions,
-        ]);
-        let roomKeyMessage;
-        try {
-            roomKeyMessage = await this._megolmEncryption.ensureOutboundSession(this._room.id, this._encryptionParams, txn);
-        } catch (err) {
-            txn.abort();
-            throw err;
-        }
-        // will complete the txn
+    async ensureNextMessageKeyIsShared(hsApi) {
+        const roomKeyMessage = await this._megolmEncryption.ensureOutboundSession(this._room.id, this._encryptionParams);
         if (roomKeyMessage) {
-            await this._shareNewRoomKey(roomKeyMessage, hsApi, txn);
+            await this._shareNewRoomKey(roomKeyMessage, hsApi);
         }
     }
 
@@ -288,12 +276,12 @@ export class RoomEncryption {
         return false;
     }
 
-    async _shareNewRoomKey(roomKeyMessage, hsApi, txn = null) {
+    async _shareNewRoomKey(roomKeyMessage, hsApi) {
         const devices = await this._deviceTracker.devicesForTrackedRoom(this._room.id, hsApi);
         const userIds = Array.from(devices.reduce((set, device) => set.add(device.userId), new Set()));
 
         // store operation for room key share, in case we don't finish here
-        const writeOpTxn = txn || this._storage.readWriteTxn([this._storage.storeNames.operations]);
+        const writeOpTxn = this._storage.readWriteTxn([this._storage.storeNames.operations]);
         let operationId;
         try {
             operationId = this._writeRoomKeyShareOperation(roomKeyMessage, userIds, writeOpTxn);
diff --git a/src/matrix/e2ee/megolm/Encryption.js b/src/matrix/e2ee/megolm/Encryption.js
index fea9cd29..2e077c47 100644
--- a/src/matrix/e2ee/megolm/Encryption.js
+++ b/src/matrix/e2ee/megolm/Encryption.js
@@ -56,7 +56,6 @@ export class Encryption {
                 roomKeyMessage = this._readOrCreateSession(session, sessionEntry, roomId, encryptionParams, txn);
                 if (roomKeyMessage) {
                     this._writeSession(sessionEntry, session, roomId, txn);
-                    return roomKeyMessage;
                 }
             } catch (err) {
                 txn.abort();