summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2018-10-15 10:19:43 +0100
committerGitHub <noreply@github.com>2018-10-15 10:19:43 +0100
commit03c11032c346645ce5fc092f0755aaae39ff3bc7 (patch)
treee96e6846363f59c82513ffaf5f976c0b475f2d06 /synapse/server.py
parentMerge pull request #4033 from intelfx/py37-hotfixes (diff)
parentmissed one (diff)
downloadsynapse-03c11032c346645ce5fc092f0755aaae39ff3bc7.tar.xz
Merge pull request #4019 from matrix-org/dbkr/e2e_backups
E2E backups
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py

index 938a05f9dc..3e9d3d8256 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -51,6 +51,7 @@ from synapse.handlers.deactivate_account import DeactivateAccountHandler from synapse.handlers.device import DeviceHandler from synapse.handlers.devicemessage import DeviceMessageHandler from synapse.handlers.e2e_keys import E2eKeysHandler +from synapse.handlers.e2e_room_keys import E2eRoomKeysHandler from synapse.handlers.events import EventHandler, EventStreamHandler from synapse.handlers.groups_local import GroupsLocalHandler from synapse.handlers.initial_sync import InitialSyncHandler @@ -130,6 +131,7 @@ class HomeServer(object): 'auth_handler', 'device_handler', 'e2e_keys_handler', + 'e2e_room_keys_handler', 'event_handler', 'event_stream_handler', 'initial_sync_handler', @@ -299,6 +301,9 @@ class HomeServer(object): def build_e2e_keys_handler(self): return E2eKeysHandler(self) + def build_e2e_room_keys_handler(self): + return E2eRoomKeysHandler(self) + def build_application_service_api(self): return ApplicationServiceApi(self)