diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-07 13:14:45 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-07 13:14:45 -0400 |
| commit | 0d61d1d7351a8d2e2512dbcaf149e1f19f2271ec (patch) | |
| tree | 9dccb1711608f8c0b3a6dcd22eaa6f100c7a4e17 /synapse/handlers/devicemessage.py | |
| parent | use something that's the right type for user_id (diff) | |
| parent | Servers-known-about statistic (#5981) (diff) | |
| download | synapse-0d61d1d7351a8d2e2512dbcaf149e1f19f2271ec.tar.xz | |
Merge branch 'develop' into cross-signing_sig_upload
Diffstat (limited to 'synapse/handlers/devicemessage.py')
| -rw-r--r-- | synapse/handlers/devicemessage.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/handlers/devicemessage.py b/synapse/handlers/devicemessage.py index 01731cb2d0..0043cbea17 100644 --- a/synapse/handlers/devicemessage.py +++ b/synapse/handlers/devicemessage.py @@ -25,7 +25,6 @@ from synapse.logging.opentracing import ( log_kv, set_tag, start_active_span, - whitelisted_homeserver, ) from synapse.types import UserID, get_domain_from_id from synapse.util.stringutils import random_string @@ -121,9 +120,7 @@ class DeviceMessageHandler(object): "sender": sender_user_id, "type": message_type, "message_id": message_id, - "org.matrix.opentracing_context": json.dumps(context) - if whitelisted_homeserver(destination) - else None, + "org.matrix.opentracing_context": json.dumps(context), } log_kv({"local_messages": local_messages}) |