You've already forked matrix-js-sdk
mirror of
https://github.com/matrix-org/matrix-js-sdk.git
synced 2025-08-09 10:22:46 +03:00
make it work
This commit is contained in:
@@ -418,6 +418,17 @@ MatrixClient.prototype.setGlobalBlacklistUnverifiedDevices = function(value) {
|
|||||||
this._crypto.setGlobalBlacklistUnverifiedDevices(value);
|
this._crypto.setGlobalBlacklistUnverifiedDevices(value);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return {boolean} whether to unilaterally blacklist all
|
||||||
|
* unverified devices
|
||||||
|
*/
|
||||||
|
MatrixClient.prototype.getGlobalBlacklistUnverifiedDevices = function() {
|
||||||
|
if (this._crypto === null) {
|
||||||
|
throw new Error("End-to-end encryption disabled");
|
||||||
|
}
|
||||||
|
return this._crypto.getGlobalBlacklistUnverifiedDevices();
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get e2e information on the device that sent an event
|
* Get e2e information on the device that sent an event
|
||||||
*
|
*
|
||||||
|
@@ -475,7 +475,8 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
|
|||||||
//
|
//
|
||||||
// XXX: what if the cache is stale, and the user left the room we had in common
|
// XXX: what if the cache is stale, and the user left the room we had in common
|
||||||
// and then added new devices before joining this one? --Matthew
|
// and then added new devices before joining this one? --Matthew
|
||||||
return this._crypto.downloadKeys(roomMembers, false).then(function(devices) {
|
var self = this;
|
||||||
|
return self._crypto.downloadKeys(roomMembers, false).then(function(devices) {
|
||||||
// remove any blocked (aka blacklisted) devices
|
// remove any blocked (aka blacklisted) devices
|
||||||
for (const userId in devices) {
|
for (const userId in devices) {
|
||||||
if (!devices.hasOwnProperty(userId)) {
|
if (!devices.hasOwnProperty(userId)) {
|
||||||
@@ -491,7 +492,7 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
|
|||||||
if (userDevices[deviceId].isBlocked() ||
|
if (userDevices[deviceId].isBlocked() ||
|
||||||
(userDevices[deviceId].isUnverified() &&
|
(userDevices[deviceId].isUnverified() &&
|
||||||
(room.getBlacklistUnverifiedDevices() ||
|
(room.getBlacklistUnverifiedDevices() ||
|
||||||
this._crypto.getGlobalBlacklistUnverifiedDevices())))
|
self._crypto.getGlobalBlacklistUnverifiedDevices())))
|
||||||
{
|
{
|
||||||
delete userDevices[deviceId];
|
delete userDevices[deviceId];
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user