From ae85ec22bbcdf7e7cf4198a1b2bb0775374b7f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 21 May 2019 12:31:58 +0200
Subject: [PATCH] ui: Send the room display name in the UnverifiedDevices
 signal.

---
 pantalaimon/daemon.py          | 12 +++++++++---
 pantalaimon/thread_messages.py |  1 +
 pantalaimon/ui.py              | 20 +++++++++++++++++++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/pantalaimon/daemon.py b/pantalaimon/daemon.py
index 2f4b87f..e9d5b1a 100755
--- a/pantalaimon/daemon.py
+++ b/pantalaimon/daemon.py
@@ -26,7 +26,8 @@ from pantalaimon.thread_messages import (AcceptSasMessage, CancelSasMessage,
                                          ExportKeysMessage, ImportKeysMessage,
                                          SasMessage, StartSasMessage,
                                          UpdateDevicesMessage,
-                                         UpdateUsersMessage)
+                                         UpdateUsersMessage,
+                                         UnverifiedDevicesSignal)
 
 
 @attr.s
@@ -678,7 +679,8 @@ class ProxyDaemon:
 
         # The room is not in the joined rooms list, just forward it.
         try:
-            encrypt = client.rooms[room_id].encrypted
+            room = client.rooms[room_id]
+            encrypt = room.encrypted
         except KeyError:
             return await self.forward_to_web(
                 request,
@@ -727,7 +729,11 @@ class ProxyDaemon:
                 # the UI thread about this and wait for a response.
                 queue = asyncio.Queue()
 
-                message = UnverifiedDevicesSignal(client.user_id, room_id)
+                message = UnverifiedDevicesSignal(
+                    client.user_id,
+                    room_id,
+                    room.display_name
+                )
                 await self.send_queue.put(message)
 
                 # TODO allow dbus clients to answer us here.
diff --git a/pantalaimon/thread_messages.py b/pantalaimon/thread_messages.py
index e4dedb7..1cf8e27 100644
--- a/pantalaimon/thread_messages.py
+++ b/pantalaimon/thread_messages.py
@@ -10,6 +10,7 @@ class Message:
 class UnverifiedDevicesSignal(Message):
     pan_user = attr.ib()
     room_id = attr.ib()
+    room_display_name = attr.ib()
 
 
 @attr.s
diff --git a/pantalaimon/ui.py b/pantalaimon/ui.py
index 6e3a86e..1888221 100644
--- a/pantalaimon/ui.py
+++ b/pantalaimon/ui.py
@@ -56,6 +56,16 @@ class Control:
                 <arg type='u' name='id' direction='out'/>
             </method>
 
+            <method name='SendAnyways'>
+                <arg type='s' name='pan_user' direction='in'/>
+                <arg type='s' name='room_id' direction='in'/>
+            </method>
+
+            <method name='CancelSending'>
+                <arg type='s' name='pan_user' direction='in'/>
+                <arg type='s' name='room_id' direction='in'/>
+            </method>
+
             <signal name="Response">
                 <arg direction="out" type="i" name="id"/>
                 <arg direction="out" type="s" name="pan_user"/>
@@ -65,6 +75,7 @@ class Control:
             <signal name="UnverifiedDevices">
                 <arg direction="out" type="s" name="pan_user"/>
                 <arg direction="out" type="s" name="room_id"/>
+                <arg direction="out" type="s" name="room_display_name"/>
             </signal>
 
         </interface>
@@ -114,6 +125,12 @@ class Control:
         self.queue.put(message)
         return message.message_id
 
+    def SendAnyways(self, pan_user, room_id):
+        pass
+
+    def CancelSending(self, pan_user, room_id):
+        pass
+
 
 class Devices:
     """
@@ -394,7 +411,8 @@ class GlibT:
         elif isinstance(message, UnverifiedDevicesSignal):
             self.control_if.UnverifiedDevices(
                 message.pan_user,
-                message.room_id
+                message.room_id,
+                message.room_display_name
             )
 
         elif isinstance(message, InviteSasSignal):