diff options
| author | Erik Johnston <erikj@jki.re> | 2018-11-08 14:37:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-08 14:37:20 +0000 |
| commit | 7b22421a7b3a40462d919faa0016635ed0419a60 (patch) | |
| tree | f0d51435a45fbceaffd9178e7bb74220081d0697 /synapse | |
| parent | Merge pull request #4163 from matrix-org/rav/fix_consent_on_py3 (diff) | |
| parent | Add test to assert set_e2e_device_keys correctly returns False on no-op (diff) | |
| download | synapse-7b22421a7b3a40462d919faa0016635ed0419a60.tar.xz | |
Merge pull request #4164 from matrix-org/erikj/fix_device_comparison
Fix noop checks when updating device keys
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/end_to_end_keys.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py index 1f1721e820..2a0f6cfca9 100644 --- a/synapse/storage/end_to_end_keys.py +++ b/synapse/storage/end_to_end_keys.py @@ -40,7 +40,10 @@ class EndToEndKeyStore(SQLBaseStore): allow_none=True, ) - new_key_json = encode_canonical_json(device_keys) + # In py3 we need old_key_json to match new_key_json type. The DB + # returns unicode while encode_canonical_json returns bytes. + new_key_json = encode_canonical_json(device_keys).decode("utf-8") + if old_key_json == new_key_json: return False |