From 2d6f580c871df055ca79b8a8be53e53e62aa155c Mon Sep 17 00:00:00 2001 From: Marvin W Date: Mon, 13 Mar 2017 21:54:12 +0100 Subject: correctly bootstrap omemo when there is no devicelist on server yet + concurrency bug fixes --- libdino/src/service/message_manager.vala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libdino/src') diff --git a/libdino/src/service/message_manager.vala b/libdino/src/service/message_manager.vala index 9f87c932..d159158b 100644 --- a/libdino/src/service/message_manager.vala +++ b/libdino/src/service/message_manager.vala @@ -85,8 +85,10 @@ public class MessageManager : StreamInteractionModule, Object { private void send_unsent_messages(Account account) { Gee.List unsend_messages = db.get_unsend_messages(account); foreach (Entities.Message message in unsend_messages) { - Conversation conversation = ConversationManager.get_instance(stream_interactor).get_conversation(message.counterpart, account); - send_xmpp_message(message, conversation, true); + Conversation? conversation = ConversationManager.get_instance(stream_interactor).get_conversation(message.counterpart, account); + if (conversation != null) { + send_xmpp_message(message, conversation, true); + } } } -- cgit v1.2.3-54-g00ecf