aboutsummaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2020-12-04 17:10:46 +0100
committerfiaxh <git@lightrise.org>2020-12-04 17:16:09 +0100
commitf31e96d6bb51448a87edd820ebca630ca576d890 (patch)
treea5073e29a7520d7356c7641545aea024ddd06d8e /main
parentc0be0f5f85e9976400be5a6f7f3898366ecbbad4 (diff)
downloaddino-f31e96d6bb51448a87edd820ebca630ca576d890.tar.gz
dino-f31e96d6bb51448a87edd820ebca630ca576d890.zip
Improve contact description in OMEMO warnings
fixes #947
Diffstat (limited to 'main')
-rw-r--r--main/src/ui/conversation_content_view/conversation_view.vala1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/src/ui/conversation_content_view/conversation_view.vala b/main/src/ui/conversation_content_view/conversation_view.vala
index 0d61a0d1..e46cd71f 100644
--- a/main/src/ui/conversation_content_view/conversation_view.vala
+++ b/main/src/ui/conversation_content_view/conversation_view.vala
@@ -412,6 +412,7 @@ public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins
private bool can_merge(Plugins.MetaConversationItem upper_item /*more recent, displayed below*/, Plugins.MetaConversationItem lower_item /*less recent, displayed above*/) {
return upper_item.display_time != null && lower_item.display_time != null &&
upper_item.display_time.difference(lower_item.display_time) < TimeSpan.MINUTE &&
+ upper_item.jid != null && lower_item.jid != null &&
upper_item.jid.equals(lower_item.jid) &&
upper_item.encryption == lower_item.encryption &&
(upper_item.mark == Message.Marked.WONTSEND) == (lower_item.mark == Message.Marked.WONTSEND);