OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Update synapse/storage/data_stores/main/devices.py 

Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
pull/5727/head
Hubert Chathi 2019-10-31 22:49:48 -04:00 committed by GitHub
parent 6f4bc6d01d
commit c3fc176c60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/storage/data_stores/main/devices.py
View File

@ -203,7 +203,7 @@ class DeviceWorkerStore(SQLBaseStore):
result = cross_signing_keys_by_user.setdefault(user_id, {}) result = cross_signing_keys_by_user.setdefault(user_id, {})
result["master_key"] = master_key_by_user[user_id]["key_info"] result["master_key"] = master_key_by_user[user_id]["key_info"]
elif ( elif (
user_id in master_key_by_user user_id in self_signing_key_by_user
and device_id == self_signing_key_by_user[user_id]["device_id"] and device_id == self_signing_key_by_user[user_id]["device_id"]
): ):
result = cross_signing_keys_by_user.setdefault(user_id, {}) result = cross_signing_keys_by_user.setdefault(user_id, {})