summary refs log tree commit diff
path: root/synapse/handlers/device.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-08-03 11:39:39 +0100
committerRichard van der Hoff <richard@matrix.org>2016-08-03 11:53:00 +0100
commit4fec5e57be72e5374342637b4062aeff0df6adc3 (patch)
treeb68915d878f12637860e7a283cbcd27471f79a2c /synapse/handlers/device.py
parentFactor out some of the code shared between the sytest scripts (#974) (diff)
downloadsynapse-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/handlers/device.py')
-rw-r--r--synapse/handlers/device.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index f4bf159bb5..fcbe7f8e6b 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -29,7 +29,7 @@ class DeviceHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def check_device_registered(self, user_id, device_id,
-                                initial_device_display_name):
+                                initial_device_display_name = None):
         """
         If the given device has not been registered, register it with the
         supplied display name.