diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-09-01 12:41:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 12:41:21 +0100 |
| commit | aa07c37cf0a3b812e6aa1bb2d97d543e6925c8e2 (patch) | |
| tree | af99caaf532a2368a97aea027998a58fd4c9232e /synapse/handlers | |
| parent | Rename `get_e2e_device_keys` to better reflect its purpose (#8205) (diff) | |
| download | synapse-aa07c37cf0a3b812e6aa1bb2d97d543e6925c8e2.tar.xz | |
Move and rename `get_devices_with_keys_by_user` (#8204)
* Move `get_devices_with_keys_by_user` to `EndToEndKeyWorkerStore` this seems a better fit for it. This commit simply moves the existing code: no other changes at all. * Rename `get_devices_with_keys_by_user` to better reflect what it does. * get_device_stream_token abstract method To avoid referencing fields which are declared in the derived classes, make `get_device_stream_token` abstract, and define that in the classes which define `_device_list_id_gen`.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/device.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index db417d60de..ee4666337a 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -234,7 +234,9 @@ class DeviceWorkerHandler(BaseHandler): return result async def on_federation_query_user_devices(self, user_id): - stream_id, devices = await self.store.get_devices_with_keys_by_user(user_id) + stream_id, devices = await self.store.get_e2e_device_keys_for_federation_query( + user_id + ) master_key = await self.store.get_e2e_cross_signing_key(user_id, "master") self_signing_key = await self.store.get_e2e_cross_signing_key( user_id, "self_signing" |