Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-08 22:55:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into cross-signing_hidden

Browse source
This commit is contained in:
Hubert Chathi 2019-07-30 23:33:06 -04:00
commit c1f0a5636c
298 changed files with 3402 additions and 2125 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/storage/end_to_end_keys.py
View file

@ -41,7 +41,7 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
dict containing "key_json", "device_display_name".
"""
if not query_list:
defer.returnValue({})
return {}
results = yield self.runInteraction(
"get_e2e_device_keys",
@ -55,7 +55,7 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
for device_id, device_info in iteritems(device_keys):
device_info["keys"] = db_to_json(device_info.pop("key_json"))
defer.returnValue(results)
return results
def _get_e2e_device_keys_txn(
self, txn, query_list, include_all_devices=False, include_deleted_devices=False
@ -130,9 +130,7 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
desc="add_e2e_one_time_keys_check",
)
defer.returnValue(
{(row["algorithm"], row["key_id"]): row["key_json"] for row in rows}
)
return {(row["algorithm"], row["key_id"]): row["key_json"] for row in rows}
@defer.inlineCallbacks
def add_e2e_one_time_keys(self, user_id, device_id, time_now, new_keys):