OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

fix factoring out of _should_replace_room_key

pull/3757/head
Matthew Hodgson 2017-12-24 15:03:44 +00:00 committed by Hubert Chathi
parent cac0253799
commit ca0b052307
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/handlers/e2e_room_keys.py
View File

@ -100,15 +100,16 @@ class E2eRoomKeysHandler(object):
else: else:
raise e raise e
if _should_replace_room_key(current_room_key, room_key): if E2eRoomKeysHandler._should_replace_room_key(current_room_key, room_key):
yield self.store.set_e2e_room_key( yield self.store.set_e2e_room_key(
user_id, version, room_id, session_id, room_key user_id, version, room_id, session_id, room_key
) )
@staticmethod
def _should_replace_room_key(current_room_key, room_key): def _should_replace_room_key(current_room_key, room_key):
""" """
Determine whether to replace the current_room_key in our backup for this Determine whether to replace a given current_room_key (if any)
session (if any) with a new room_key that has been uploaded. with a newly uploaded room_key backup
Args: Args:
current_room_key (dict): Optional, the current room_key dict if any current_room_key (dict): Optional, the current room_key dict if any