also mark previews unread messages as read

1 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index e86758fd7..7cfd69e8b 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -844,7 +844,17 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                             if (message.addReadByMarker(readByMarker)) {
                                 Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": added read by (" + readByMarker.getRealJid() + ") to message '" + message.getBody() + "'");
                                 mXmppConnectionService.updateMessage(message, false);
-                                mXmppConnectionService.markMessage(account, from.asBareJid(), id, Message.STATUS_SEND_DISPLAYED);
+                                final Message displayedMessage = mXmppConnectionService.markMessage(account, from.asBareJid(), id, Message.STATUS_SEND_DISPLAYED);
+                                Message m = displayedMessage == null ? null : displayedMessage.prev();
+                                while (m != null
+                                        && m.getStatus() == Message.STATUS_SEND_RECEIVED
+                                        && m.getTimeSent() < displayedMessage.getTimeSent()) {
+                                    mXmppConnectionService.markMessage(m, Message.STATUS_SEND_DISPLAYED);
+                                    m = m.prev();
+                                }
+                                if (displayedMessage != null && selfAddressed) {
+                                    dismissNotification(account, counterpart, query);
+                                }
                             }
                         }
                     }