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

need to pass in olm

Browse Source
This commit is contained in:
Bruno Windels 2020-09-02 14:52:19 +02:00
parent 1f66868566
commit 14cba7ec6e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/matrix/Session.js
View File

@ -63,7 +63,7 @@ export class Session {
storage: this._storage, storage: this._storage,
olm: this._olm, olm: this._olm,
}); });
const megolmDecryption = new MegOlmDecryption({pickleKey: PICKLE_KEY}); const megolmDecryption = new MegOlmDecryption({pickleKey: PICKLE_KEY, olm: this._olm});
this._deviceMessageHandler.enableEncryption({olmDecryption, megolmDecryption}); this._deviceMessageHandler.enableEncryption({olmDecryption, megolmDecryption});
} }

3
src/matrix/e2ee/megolm/Decryption.js
View File

@ -16,8 +16,9 @@ limitations under the License.
// senderKey is a curve25519 key // senderKey is a curve25519 key
export class Decryption { export class Decryption {
constructor({pickleKey}) { constructor({pickleKey, olm}) {
this._pickleKey = pickleKey; this._pickleKey = pickleKey;
this._olm = olm;
} }
async addRoomKeys(payloads, txn) { async addRoomKeys(payloads, txn) {