diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2016-07-27 18:16:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-27 18:16:57 +0100 |
| commit | 40e539683c65119400fa6487d7b8fd658b99eeae (patch) | |
| tree | ea1dec0d3e43fdf90a2124bd6025a70710f629c6 /synapse/handlers/device.py | |
| parent | Merge pull request #957 from matrix-org/markjh/verify (diff) | |
| parent | key upload tweaks (diff) | |
| download | synapse-40e539683c65119400fa6487d7b8fd658b99eeae.tar.xz | |
Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload
Make the device id on e2e key upload optional
Diffstat (limited to 'synapse/handlers/device.py')
| -rw-r--r-- | synapse/handlers/device.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index eaead50800..f4bf159bb5 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -143,6 +143,10 @@ class DeviceHandler(BaseHandler): delete_refresh_tokens=True, ) + yield self.store.delete_e2e_keys_by_device( + user_id=user_id, device_id=device_id + ) + @defer.inlineCallbacks def update_device(self, user_id, device_id, content): """ Update the given device |