matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Merge branch 'develop' into travis/sourcemaps

Browse Source
This commit is contained in:
Travis Ralston
2020-01-13 11:17:27 -07:00
parent 5bd005b28a fa679e873d
commit 458b2d422d
3 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/crypto/algorithms/megolm.js
View File

@@ -465,15 +465,15 @@ MegolmEncryption.prototype._splitBlockedDevices = function(devicesByUser) {
MegolmEncryption.prototype._encryptAndSendKeysToDevices = function(
session, chainIndex, userDeviceMap, payload,
) {
const encryptedContent = {
algorithm: olmlib.OLM_ALGORITHM,
sender_key: this._olmDevice.deviceCurve25519Key,
ciphertext: {},
};
const contentMap = {};
const promises = [];
for (let i = 0; i < userDeviceMap.length; i++) {
const encryptedContent = {
algorithm: olmlib.OLM_ALGORITHM,
sender_key: this._olmDevice.deviceCurve25519Key,
ciphertext: {},
};
const val = userDeviceMap[i];
const userId = val.userId;
const deviceInfo = val.deviceInfo;