tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #981 from matrix-org/rav/omit_device_displayname_if_null

Browse source 
keys/query: Omit device displayname if null
This commit is contained in:
Richard van der Hoff 2016-08-04 12:51:43 +01:00 committed by GitHub
commit ab03912e94
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
synapse/handlers/e2e_keys.py
View file

@ -122,9 +122,10 @@ class E2eKeysHandler(object):
for user_id, device_keys in results.items():
for device_id, device_info in device_keys.items():
r = json.loads(device_info["key_json"])
r["unsigned"] = {
"device_display_name": device_info["device_display_name"],
}
r["unsigned"] = {}
display_name = device_info["device_display_name"]
if display_name is not None:
r["unsigned"]["device_display_name"] = display_name
result_dict[user_id][device_id] = r
defer.returnValue(result_dict)