Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-07-10 15:12:51 +00:00
commit f2e3e30af8

View File

@ -44,7 +44,7 @@ export function markAllDevicesKnown(matrixClient, devices) {
* module:crypto~DeviceInfo|DeviceInfo}. * module:crypto~DeviceInfo|DeviceInfo}.
*/ */
export function getUnknownDevicesForRoom(matrixClient, room) { export function getUnknownDevicesForRoom(matrixClient, room) {
const roomMembers = room.getJoinedMembers().map((m) => { const roomMembers = room.getEncryptionTargetMembers().map((m) => {
return m.userId; return m.userId;
}); });
return matrixClient.downloadKeys(roomMembers, false).then((devices) => { return matrixClient.downloadKeys(roomMembers, false).then((devices) => {