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

Merge branch 'rav/null_default_device_displayname' into develop

Browse source
This commit is contained in:
Richard van der Hoff 2016-08-03 14:30:32 +01:00
commit 530bc862dc
4 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/rest/client/v2_alpha/keys.py
View file

@ -130,9 +130,7 @@ class KeyUploadServlet(RestServlet):
# old access_token without an associated device_id. Either way, we
# need to double-check the device is registered to avoid ending up with
# keys without a corresponding device.
self.device_handler.check_device_registered(
user_id, device_id, "unknown device"
)
self.device_handler.check_device_registered(user_id, device_id)
result = yield self.store.count_e2e_one_time_keys(user_id, device_id)
defer.returnValue((200, {"one_time_key_counts": result}))