Make Room.getEncryptionTargetMembers async, as members might be loading

src/crypto/algorithms/megolm.js

@@ -535,8 +535,9 @@ MegolmEncryption.prototype._checkForUnknownDevices = function(devicesInRoom) {
  * @return {module:client.Promise} Promise which resolves to a map
  *     from userId to deviceId to deviceInfo
  */
-MegolmEncryption.prototype._getDevicesInRoom = function(room) {
-    const roomMembers = utils.map(room.getEncryptionTargetMembers(), function(u) {
+MegolmEncryption.prototype._getDevicesInRoom = async function(room) {
+    const members = await room.getEncryptionTargetMembers();
+    const roomMembers = utils.map(members, function(u) {
         return u.userId;
     });
 
@@ -555,7 +556,7 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
     // common and then added new devices before joining this one? --Matthew
     //
     // yup, see https://github.com/vector-im/riot-web/issues/2305 --richvdh
-    return this._crypto.downloadKeys(roomMembers, false).then((devices) => {
+    const devices = await this._crypto.downloadKeys(roomMembers, false);
     // remove any blocked devices
     for (const userId in devices) {
         if (!devices.hasOwnProperty(userId)) {
@@ -577,7 +578,6 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
     }
 
     return devices;
-    });
 };
 
 /**

src/crypto/algorithms/olm.js

@@ -83,18 +83,21 @@ OlmEncryption.prototype._ensureSession = function(roomMembers) {
  *
  * @return {module:client.Promise} Promise which resolves to the new event body
  */
-OlmEncryption.prototype.encryptMessage = function(room, eventType, content) {
+OlmEncryption.prototype.encryptMessage = async function(room, eventType, content) {
     // pick the list of recipients based on the membership list.
     //
     // TODO: there is a race condition here! What if a new user turns up
     // just as you are sending a secret message?
 
-    const users = utils.map(room.getEncryptionTargetMembers(), function(u) {
+    const members = await room.getEncryptionTargetMembers();
+
+    const users = utils.map(members, function(u) {
         return u.userId;
     });
 
     const self = this;
-    return this._ensureSession(users).then(function() {
+    await this._ensureSession(users);
+
     const payloadFields = {
         room_id: room.roomId,
         type: eventType,
@@ -135,8 +138,7 @@ OlmEncryption.prototype.encryptMessage = function(room, eventType, content) {
         }
     }
 
-        return Promise.all(promises).return(encryptedContent);
-    });
+    return await Promise.all(promises).return(encryptedContent);
 };
 
 /**

src/crypto/index.js

@@ -652,7 +652,7 @@ Crypto.prototype.setRoomEncryption = async function(roomId, config, inhibitDevic
         throw new Error(`Unable to enable encryption in unknown room ${roomId}`);
     }
 
-    const members = room.getEncryptionTargetMembers();
+    const members = await room.getEncryptionTargetMembers();
     members.forEach((m) => {
         this._deviceList.startTrackingDeviceList(m.userId);
     });
@@ -852,7 +852,7 @@ Crypto.prototype.handleDeviceListChanges = async function(syncData, syncDeviceLi
     // If we didn't make this assumption, we'd have to use the /keys/changes API
     // to get key changes between the sync token in the device list and the 'old'
     // sync token used here to make sure we didn't miss any.
-    this._evalDeviceListChanges(syncDeviceLists);
+    await this._evalDeviceListChanges(syncDeviceLists);
 };
 
 /**
@@ -968,7 +968,7 @@ Crypto.prototype._evalDeviceListChanges = async function(deviceLists) {
         // Check we really don't share any rooms with these users
         // any more: the server isn't required to give us the
         // exact correct set.
-        const e2eUserIds = new Set(this._getE2eUsers());
+        const e2eUserIds = new Set(await this._getE2eUsers());
 
         deviceLists.left.forEach((u) => {
             if (!e2eUserIds.has(u)) {
@@ -983,10 +983,10 @@ Crypto.prototype._evalDeviceListChanges = async function(deviceLists) {
  *
  * @returns {string[]} List of user IDs
  */
-Crypto.prototype._getE2eUsers = function() {
+Crypto.prototype._getE2eUsers = async function() {
     const e2eUserIds = [];
     for (const room of this._getE2eRooms()) {
-        const members = room.getEncryptionTargetMembers();
+        const members = await room.getEncryptionTargetMembers();
         for (const member of members) {
             e2eUserIds.push(member.userId);
         }

src/models/room.js

@@ -569,10 +569,13 @@ Room.prototype.addEventsToTimeline = function(events, toStartOfTimeline,
 
  /**
   * Get a list of members we should be encrypting for in this room
-  * @return {RoomMember[]} A list of members who we should encrypt messages for
-  *                        in this room.
+  * @return {Promise<RoomMember[]>} A list of members who
+  * we should encrypt messages for in this room.
   */
- Room.prototype.getEncryptionTargetMembers = function() {
+ Room.prototype.getEncryptionTargetMembers = async function() {
+    if (this._oobMembersPromise) {
+        await _oobMembersPromise;
+    }
     let members = this.getMembersWithMembership("join");
     if (this.shouldEncryptForInvitedMembers()) {
         members = members.concat(this.getMembersWithMembership("invite"));