Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Only return devices with keys from /federation/v1/user/devices/ #8198

Merged
merged 5 commits into from
Aug 28, 2020
Merged

Only return devices with keys from /federation/v1/user/devices/ #8198

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d674153
Move `get_devices_with_keys_by_user` into `EndToEndKeyWorkerStore`
richvdh Aug 28, 2020
acc90a7
Only return devices with keys from `/federation/v1/user/devices/`
richvdh Aug 28, 2020
e60abdb
back out changes so far
richvdh Aug 28, 2020
9546c69
Only return devices with keys from `/federation/v1/user/devices/`
richvdh Aug 28, 2020
0eed3f9
newsfile
richvdh Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions synapse/storage/databases/main/devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,9 +498,7 @@ def _get_devices_with_keys_by_user_txn(
) -> Tuple[int, List[JsonDict]]:
now_stream_id = self._device_list_id_gen.get_current_token()

devices = self._get_e2e_device_keys_txn(
txn, [(user_id, None)], include_all_devices=True
)
devices = self._get_e2e_device_keys_txn(txn, [(user_id, None)])

if devices:
user_devices = devices[user_id]
Expand Down