diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2021-07-27 14:36:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 14:36:38 +0100 |
| commit | 74d09a43d9e0f65f1292aa51f58ea676e4aefc7f (patch) | |
| tree | 3e16bb542297d2e2b6a68ed79d866afec9513207 /synapse/storage/databases/main | |
| parent | Change release script to update debian changelog for RCs (#10465) (diff) | |
| download | synapse-74d09a43d9e0f65f1292aa51f58ea676e4aefc7f.tar.xz | |
Always communicate device OTK counts to clients (#10485)
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Diffstat (limited to 'synapse/storage/databases/main')
| -rw-r--r-- | synapse/storage/databases/main/end_to_end_keys.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/end_to_end_keys.py b/synapse/storage/databases/main/end_to_end_keys.py index 78ae68ec68..1edc96042b 100644 --- a/synapse/storage/databases/main/end_to_end_keys.py +++ b/synapse/storage/databases/main/end_to_end_keys.py @@ -21,6 +21,7 @@ from canonicaljson import encode_canonical_json from twisted.enterprise.adbapi import Connection +from synapse.api.constants import DeviceKeyAlgorithms from synapse.logging.opentracing import log_kv, set_tag, trace from synapse.storage._base import SQLBaseStore, db_to_json from synapse.storage.database import DatabasePool, make_in_list_sql_clause @@ -381,9 +382,15 @@ class EndToEndKeyWorkerStore(EndToEndKeyBackgroundStore): " GROUP BY algorithm" ) txn.execute(sql, (user_id, device_id)) - result = {} + + # Initially set the key count to 0. This ensures that the client will always + # receive *some count*, even if it's 0. + result = {DeviceKeyAlgorithms.SIGNED_CURVE25519: 0} + + # Override entries with the count of any keys we pulled from the database for algorithm, key_count in txn: result[algorithm] = key_count + return result return await self.db_pool.runInteraction( |