diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-08-03 14:30:32 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-08-03 14:30:32 +0100 |
| commit | 530bc862dc9bd9d3c9f567738e8b56df1146bc3b (patch) | |
| tree | bd915629f8bc5a3a6568e1e1035d8dedf6dccae4 /synapse/rest | |
| parent | Merge branch 'rav/refactor_device_query' into develop (diff) | |
| parent | PEP8 (diff) | |
| download | synapse-530bc862dc9bd9d3c9f567738e8b56df1146bc3b.tar.xz | |
Merge branch 'rav/null_default_device_displayname' into develop
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/keys.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py index 705a0b6c17..c5ff16adf3 100644 --- a/synapse/rest/client/v2_alpha/keys.py +++ b/synapse/rest/client/v2_alpha/keys.py @@ -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})) |