From 4ad07fea47e9e3463e864673b9c601b304b05270 Mon Sep 17 00:00:00 2001
From: PapsOu <PapsOu@users.noreply.github.com>
Date: Wed, 24 Oct 2018 17:48:29 +0200
Subject: [PATCH] Fix messages never being notified from servers without MAM
 (#432)

* Comment a return that stop every notifications to be trigger when an account is not synced

* Do a correct check if MAM capability is available for the message to notify
---
 libdino/src/service/notification_events.vala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libdino/src/service/notification_events.vala b/libdino/src/service/notification_events.vala
index 8c86f9d4..c0efd7de 100644
--- a/libdino/src/service/notification_events.vala
+++ b/libdino/src/service/notification_events.vala
@@ -44,7 +44,8 @@ public class NotificationEvents : StreamInteractionModule, Object {
     }
 
     private void on_message_received(Entities.Message message, Conversation conversation) {
-        if (!synced_accounts.contains(conversation.account)) {
+        bool is_mam_message = Xep.MessageArchiveManagement.MessageFlag.get_flag(message.stanza) != null;
+        if (!synced_accounts.contains(conversation.account) && is_mam_message) {
             if (!mam_potential_new.has_key(conversation.account)) {
                 mam_potential_new[conversation.account] = new HashMap<Conversation, Entities.Message>(Conversation.hash_func, Conversation.equals_func);
             }