matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

Make olmlib.encryptMessageForDevice async

Browse Source
This commit is contained in:
Richard van der Hoff
2017-07-26 08:04:46 +01:00
parent 951df61aa0
commit aff32afefa
4 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/crypto/algorithms/olm.js
View File

@@ -107,6 +107,8 @@ OlmEncryption.prototype.encryptMessage = function(room, eventType, content) {
ciphertext: {},
};
const promises = [];
for (let i = 0; i < users.length; ++i) {
const userId = users[i];
const devices = self._crypto.getStoredDevicesForUser(userId);
@@ -123,15 +125,17 @@ OlmEncryption.prototype.encryptMessage = function(room, eventType, content) {
continue;
}
olmlib.encryptMessageForDevice(
encryptedContent.ciphertext,
self._userId, self._deviceId, self._olmDevice,
userId, deviceInfo, payloadFields,
promises.push(
olmlib.encryptMessageForDevice(
encryptedContent.ciphertext,
self._userId, self._deviceId, self._olmDevice,
userId, deviceInfo, payloadFields,
),
);
}
}
return encryptedContent;
return Promise.all(promises).return(encryptedContent);
});
};