Skip to content

Commit a1443a7

Browse files
committed
Fix backwards compatibility with old bridges
1 parent 2f57efa commit a1443a7

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

mautrix/bridge/e2ee.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,17 @@ def __init__(
119119
self.az.device_list_handler = self.crypto.handle_as_device_lists
120120
self.az.to_device_handler = self.crypto.handle_as_to_device_event
121121

122-
delete_cfg = bridge.config["bridge.encryption.delete_keys"]
123-
self.crypto.delete_outbound_keys_on_ack = delete_cfg["delete_outbound_on_ack"]
124-
self.crypto.dont_store_outbound_keys = delete_cfg["dont_store_outbound"]
125-
self.crypto.delete_previous_keys_on_receive = delete_cfg["delete_prev_on_new_session"]
126-
self.crypto.ratchet_keys_on_decrypt = delete_cfg["ratchet_on_decrypt"]
127-
self.crypto.delete_fully_used_keys_on_decrypt = delete_cfg["delete_fully_used_on_decrypt"]
128-
self.crypto.delete_keys_on_device_delete = delete_cfg["delete_on_device_delete"]
129-
self.periodically_delete_expired_keys = delete_cfg["periodically_delete_expired"]
122+
self.periodically_delete_expired_keys = False
130123
self._key_delete_task = None
124+
del_cfg = bridge.config["bridge.encryption.delete_keys"]
125+
if del_cfg:
126+
self.crypto.delete_outbound_keys_on_ack = del_cfg["delete_outbound_on_ack"]
127+
self.crypto.dont_store_outbound_keys = del_cfg["dont_store_outbound"]
128+
self.crypto.delete_previous_keys_on_receive = del_cfg["delete_prev_on_new_session"]
129+
self.crypto.ratchet_keys_on_decrypt = del_cfg["ratchet_on_decrypt"]
130+
self.crypto.delete_fully_used_keys_on_decrypt = del_cfg["delete_fully_used_on_decrypt"]
131+
self.crypto.delete_keys_on_device_delete = del_cfg["delete_on_device_delete"]
132+
self.periodically_delete_expired_keys = del_cfg["periodically_delete_expired"]
131133

132134
async def _exit_on_sync_fail(self, data) -> None:
133135
if data["error"]:

0 commit comments

Comments
 (0)