mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 09:40:22 +00:00
Ignore remote device displaynames if MSC3480 enabled
This commit is contained in:
parent
c601f796fc
commit
813bab78ce
1 changed files with 9 additions and 2 deletions
|
@ -204,8 +204,15 @@ class E2eKeysHandler:
|
||||||
for user_id, devices in remote_results.items():
|
for user_id, devices in remote_results.items():
|
||||||
user_devices = results.setdefault(user_id, {})
|
user_devices = results.setdefault(user_id, {})
|
||||||
for device_id, device in devices.items():
|
for device_id, device in devices.items():
|
||||||
keys = device.get("keys", None)
|
keys = device.get("keys")
|
||||||
device_display_name = device.get("device_display_name", None)
|
|
||||||
|
# Extract the displayname of the remote device
|
||||||
|
device_display_name = None
|
||||||
|
if self.config.experimental.msc3480_enabled is not True:
|
||||||
|
# Ignore remote device names if experimental MSC3480 support
|
||||||
|
# is enabled.
|
||||||
|
device_display_name = device.get("device_display_name")
|
||||||
|
|
||||||
if keys:
|
if keys:
|
||||||
result = dict(keys)
|
result = dict(keys)
|
||||||
unsigned = result.setdefault("unsigned", {})
|
unsigned = result.setdefault("unsigned", {})
|
||||||
|
|
Loading…
Reference in a new issue