Merge branch 'bostrt-spamfix' into develop

app/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java

@@ -215,8 +215,12 @@ public class RoomChat extends AbstractChat {
                 RosterManager.getInstance().onContactChanged(account, bareAddress);
                 newAction(resource, subject, ChatAction.subject);
             } else {
+                boolean notify = true;
                 String packetID = message.getPacketID();
                 Date delay = Delay.getDelay(message);
+                if (delay != null) {
+                    notify = false;
+                }
                 for (MessageItem messageItem : messages) {
                     // Search for duplicates
                     if (packetID != null && packetID.equals(messageItem.getPacketID())) {
@@ -232,7 +236,7 @@ public class RoomChat extends AbstractChat {
                 }
                 updateThreadId(message.getThread());
                 MessageItem messageItem = newMessage(resource, text, null,
-                        delay, true, true, false, false, true);
+                        delay, true, notify, false, false, true);
                 messageItem.setPacketID(packetID);
             }
         } else if (packet instanceof Presence) {