aboutsummaryrefslogtreecommitdiff
path: root/libdino/src/service
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2017-03-13 21:54:12 +0100
committerMarvin W <git@larma.de>2017-03-13 22:00:17 +0100
commit2d6f580c871df055ca79b8a8be53e53e62aa155c (patch)
tree9c69f7c7e6a4f4ae2a3137fc580dbb507abf2ad4 /libdino/src/service
parent1a4cd2508bfc71801d9a1f7029580cc9e4fdf659 (diff)
downloaddino-2d6f580c871df055ca79b8a8be53e53e62aa155c.tar.gz
dino-2d6f580c871df055ca79b8a8be53e53e62aa155c.zip
correctly bootstrap omemo when there is no devicelist on server yet + concurrency bug fixes
Diffstat (limited to 'libdino/src/service')
-rw-r--r--libdino/src/service/message_manager.vala6
1 files changed, 4 insertions, 2 deletions
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<Entities.Message> 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);
+ }
}
}