From 94bd696655ff56be605ce8aa771b0875be05e772 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Thu, 17 Dec 2020 22:03:32 +0100
Subject: [PATCH] Final fixes to private chats
---
briar-gtk/briar_gtk/controllers/main_window.py | 2 --
briar-gtk/briar_gtk/controllers/private_chat.py | 7 +++----
briar-gtk/briar_gtk/views/private_chat.py | 3 ++-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/briar-gtk/briar_gtk/controllers/main_window.py b/briar-gtk/briar_gtk/controllers/main_window.py
index 772ec56..186e436 100644
--- a/briar-gtk/briar_gtk/controllers/main_window.py
+++ b/briar-gtk/briar_gtk/controllers/main_window.py
@@ -44,8 +44,6 @@ class MainWindowController:
self._private_chat_controller = None
def open_private_chat(self, contact_id):
- if self._private_chat_controller is not None:
- raise Exception("Private Chat is already open")
private_chat_view = PrivateChatView(self._builder)
self._private_chat_controller = PrivateChatController(
contact_id, private_chat_view, self._sidebar_controller,
diff --git a/briar-gtk/briar_gtk/controllers/private_chat.py b/briar-gtk/briar_gtk/controllers/private_chat.py
index edccf2e..652ad02 100644
--- a/briar-gtk/briar_gtk/controllers/private_chat.py
+++ b/briar-gtk/briar_gtk/controllers/private_chat.py
@@ -107,10 +107,9 @@ class PrivateChatController:
confirmation_dialog.show_all()
def open_private_chat(self, contact_id):
- print(f"Contact id: {contact_id}")
contact_name = self._get_contact_name(contact_id)
self._prepare_chat_view(contact_name)
- self._setup_private_chat_widget(contact_id)
+ self._setup_private_chat_widget(contact_name, contact_id)
self._current_contact_id = contact_id
@staticmethod
@@ -170,8 +169,8 @@ class PrivateChatController:
for child in children:
child.destroy()
- def _setup_private_chat_widget(self, contact_id):
- self._private_chat_view.setup_view(contact_id)
+ def _setup_private_chat_widget(self, contact_name, contact_id):
+ self._private_chat_view.setup_view(contact_name, contact_id)
self._private_chat_view.load_content()
history_container = self._builder.get_object("history_container")
history_container.add(self._private_chat_view)
diff --git a/briar-gtk/briar_gtk/views/private_chat.py b/briar-gtk/briar_gtk/views/private_chat.py
index 24d3bd7..b1f25a9 100644
--- a/briar-gtk/briar_gtk/views/private_chat.py
+++ b/briar-gtk/briar_gtk/views/private_chat.py
@@ -49,7 +49,8 @@ class PrivateChatView(Gtk.Overlay):
widget.set_text("")
GLib.idle_add(self._scroll_to_bottom)
- def setup_view(self, contact_id):
+ def setup_view(self, contact_name, contact_id):
+ self._contact_name = contact_name
self._contact_id = contact_id
self._add_from_resource(self.CONTAINER_UI)
--
GitLab