From bdb970b8ada0363b9bc01d211f4af794b52c9284 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 28 Nov 2017 20:48:45 +0100 Subject: some bug fixes --- src/main/java/de/pixart/messenger/parser/MessageParser.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/pixart/messenger/parser/MessageParser.java') diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java index 7a82c9b98..60c97f394 100644 --- a/src/main/java/de/pixart/messenger/parser/MessageParser.java +++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java @@ -336,11 +336,11 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece mXmppConnectionService.getMessageArchiveService().processFinLegacy(fin, original.getFrom()); return; } - final boolean mamlegacy = original.hasChild("result", Namespace.MAM_LEGACY); - final Element result = original.findChild("result", mamlegacy ? Namespace.MAM_LEGACY : Namespace.MAM); + final boolean mamLegacy = original.hasChild("result", Namespace.MAM_LEGACY); + final Element result = original.findChild("result", mamLegacy ? Namespace.MAM_LEGACY : Namespace.MAM); final MessageArchiveService.Query query = result == null ? null : mXmppConnectionService.getMessageArchiveService().findQuery(result.getAttribute("queryid")); if (query != null && query.validFrom(original.getFrom())) { - Pair f = original.getForwardedMessagePacket("result", mamlegacy ? Namespace.MAM_LEGACY : Namespace.MAM); + Pair f = original.getForwardedMessagePacket("result", mamLegacy ? Namespace.MAM_LEGACY : Namespace.MAM); if (f == null) { return; } @@ -714,7 +714,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece if (message.addReadByMarker(readByMarker)) { Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": added read by (" + readByMarker.getRealJid() + ") to message '" + message.getBody() + "'"); mXmppConnectionService.updateMessage(message); - mXmppConnectionService.markMessage(message, Message.STATUS_SEND_DISPLAYED); + mXmppConnectionService.markMessage(account, from.toBareJid(), id, Message.STATUS_SEND_DISPLAYED); } } } -- cgit v1.2.3