diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-08-03 11:39:39 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-08-03 11:53:00 +0100 |
| commit | 4fec5e57be72e5374342637b4062aeff0df6adc3 (patch) | |
| tree | b68915d878f12637860e7a283cbcd27471f79a2c /synapse/rest | |
| parent | Factor out some of the code shared between the sytest scripts (#974) (diff) | |
| download | synapse-4fec5e57be72e5374342637b4062aeff0df6adc3.tar.xz | |
Default device_display_name to null
It turns out that it's more useful to return a null device display name (and let clients decide how to handle it: eg, falling back to device_id) than using a constant string like "unknown device".
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 dc1d4d8fc6..5fa33aceea 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})) |