summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-28 10:37:43 +0100
committerErik Johnston <erik@matrix.org>2016-07-28 10:37:43 +0100
commit18e044628ed9cd6e034967e283784cf0a284a17d (patch)
tree497cc68775bc8d05883ce3eed901cec955dcfb83 /synapse/handlers
parentBump CHANGES and version (diff)
parentMerge pull request #961 from matrix-org/dbkr/fix_push_invite_name (diff)
downloadsynapse-18e044628ed9cd6e034967e283784cf0a284a17d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/device.py4
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