From 5fd5710225442f961746e45ba1445b498f32128b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 2 Oct 2018 16:40:18 +0200
Subject: [PATCH] server: Handle exception from group session sharing request.

---
 matrix/server.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/matrix/server.py b/matrix/server.py
index cbf743a..e64a15c 100644
--- a/matrix/server.py
+++ b/matrix/server.py
@@ -878,10 +878,16 @@ class MatrixServer(object):
             self.handle_backlog_response(response)
 
         elif isinstance(response, KeysClaimResponse):
-            _, request = self.client.share_group_session(
-                response.room_id,
-                ignore_missing_sessions=True
-            )
+            try:
+                _, request = self.client.share_group_session(
+                    response.room_id,
+                    ignore_missing_sessions=True
+                )
+            except OlmTrustError as e:
+                m = ("Untrusted devices found in room: {}".format(e))
+                self.error(m)
+                return
+
             self.send(request)
 
         elif isinstance(response, ShareGroupSessionResponse):