From 8109ee38b0da5e20828bbd3ef3905d11221a68cc Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Sun, 5 Apr 2020 14:00:02 +0000
Subject: [PATCH] Only add message if it belongs to contact

Before, messages from all chats were added to the current chat.

Also scrolls to bottom now after adding a message async.
---
 briar-gtk/briar_gtk/containers/private_chat.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/briar-gtk/briar_gtk/containers/private_chat.py b/briar-gtk/briar_gtk/containers/private_chat.py
index 7369970..af9062b 100644
--- a/briar-gtk/briar_gtk/containers/private_chat.py
+++ b/briar-gtk/briar_gtk/containers/private_chat.py
@@ -87,7 +87,12 @@ class PrivateChatContainer(Container):
         self._messages_box.add(message_widget)
 
     def _add_message_async(self, message):
-        GLib.idle_add(self._add_message, message)
+        if message["data"]["contactId"] == self._contact_id:
+            GLib.idle_add(self._add_message_and_scroll, message["data"])
+
+    def _add_message_and_scroll(self, message):
+        self._add_message(message)
+        GLib.idle_add(self._scroll_to_bottom)
 
     # pylint: disable=unused-argument
     def _on_message_scroll_draw(self, widget, cairo_context):
-- 
GitLab