Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-01 16:16:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into uhoreg/e2e_cross-signing_merged

Browse source
This commit is contained in:
Hubert Chathi 2019-10-18 11:39:40 +01:00
commit cfc28325a6
346 changed files with 9527 additions and 5043 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/handlers/e2e_keys.py
View file

@ -326,16 +326,10 @@ class E2eKeysHandler(object):
results = yield self.store.get_e2e_device_keys(local_query)
# Build the result structure, un-jsonify the results, and add the
# "unsigned" section
# Build the result structure
for user_id, device_keys in results.items():
for device_id, device_info in device_keys.items():
r = dict(device_info["keys"])
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
result_dict[user_id][device_id] = device_info
log_kv(results)
return result_dict