diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2021-08-17 12:32:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 12:32:25 +0100 |
| commit | b62eba770522fde7bf1204eb5771ee24d9a5e7bc (patch) | |
| tree | fa7b9bb938c8fa75b5a952be599c963149d8ebdd | |
| parent | Allow to edit `external_ids` by Edit User admin API (#10598) (diff) | |
| download | synapse-b62eba770522fde7bf1204eb5771ee24d9a5e7bc.tar.xz | |
Always list fallback key types in /sync (#10623)
Diffstat (limited to '')
| -rw-r--r-- | changelog.d/10623.bugfix | 1 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/changelog.d/10623.bugfix b/changelog.d/10623.bugfix new file mode 100644 index 0000000000..759fba3513 --- /dev/null +++ b/changelog.d/10623.bugfix @@ -0,0 +1 @@ +Revert behaviour introduced in v1.38.0 that strips `org.matrix.msc2732.device_unused_fallback_key_types` from `/sync` when its value is empty. This field should instead always be present according to [MSC2732](https://github.com/matrix-org/matrix-doc/blob/master/proposals/2732-olm-fallback-keys.md). \ No newline at end of file diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index e321668698..e18f4d01b3 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -259,10 +259,11 @@ class SyncRestServlet(RestServlet): # Corresponding synapse issue: https://github.com/matrix-org/synapse/issues/10456 response["device_one_time_keys_count"] = sync_result.device_one_time_keys_count - if sync_result.device_unused_fallback_key_types: - response[ - "org.matrix.msc2732.device_unused_fallback_key_types" - ] = sync_result.device_unused_fallback_key_types + # https://github.com/matrix-org/matrix-doc/blob/54255851f642f84a4f1aaf7bc063eebe3d76752b/proposals/2732-olm-fallback-keys.md + # states that this field should always be included, as long as the server supports the feature. + response[ + "org.matrix.msc2732.device_unused_fallback_key_types" + ] = sync_result.device_unused_fallback_key_types if joined: response["rooms"][Membership.JOIN] = joined |