diff options
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 10 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/parser/MessageParser.java | 28 |
2 files changed, 32 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 030cf9664..3df78fde0 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -839,15 +839,19 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl return this.bookmark; } - public boolean hasDuplicateMessage(Message message) { + public Message findDuplicateMessage(Message message) { synchronized (this.messages) { for (int i = this.messages.size() - 1; i >= 0; --i) { if (this.messages.get(i).similar(message)) { - return true; + return this.messages.get(i); } } } - return false; + return null; + } + + public boolean hasDuplicateMessage(Message message) { + return findDuplicateMessage(message) != null; } public Message findSentMessageWithBody(String body) { diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java index 64bb0b2d5..1bd0f4338 100644 --- a/src/main/java/de/pixart/messenger/parser/MessageParser.java +++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java @@ -470,6 +470,14 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece if (query == null && extractChatState(mXmppConnectionService.find(account, counterpart.toBareJid()), isTypeGroupChat, packet)) { mXmppConnectionService.updateConversationUi(); } + if (query != null && status == Message.STATUS_SEND && remoteMsgId != null) { + Message previouslySent = conversation.findSentMessageWithUuid(remoteMsgId); + if (previouslySent != null && previouslySent.getServerMsgId() == null && serverMsgId != null) { + previouslySent.setServerMsgId(serverMsgId); + mXmppConnectionService.databaseBackend.updateMessage(previouslySent); + Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": encountered previously sent OMEMO message without serverId. updating..."); + } + } return; } if (conversationMultiMode) { @@ -569,9 +577,23 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece boolean checkForDuplicates = (isTypeGroupChat && packet.hasChild("delay", "urn:xmpp:delay")) || message.getType() == Message.TYPE_PRIVATE || message.getServerMsgId() != null; - if (checkForDuplicates && conversation.hasDuplicateMessage(message)) { - Log.d(Config.LOGTAG, "skipping duplicate message from " + message.getCounterpart().toString() + " " + message.getBody()); - return; + if (checkForDuplicates) { + final Message duplicate = conversation.findDuplicateMessage(message); + if (duplicate != null) { + final boolean serverMsgIdUpdated; + if (duplicate.getStatus() != Message.STATUS_RECEIVED + && duplicate.getUuid().equals(message.getRemoteMsgId()) + && duplicate.getServerMsgId() == null + && message.getServerMsgId() != null) { + duplicate.setServerMsgId(message.getServerMsgId()); + mXmppConnectionService.databaseBackend.updateMessage(message); + serverMsgIdUpdated = true; + } else { + serverMsgIdUpdated = false; + } + Log.d(Config.LOGTAG, "skipping duplicate message with " + message.getCounterpart() + ". serverMsgIdUpdated=" + Boolean.toString(serverMsgIdUpdated)); + return; + } } if (query != null && query.getPagingOrder() == MessageArchiveService.PagingOrder.REVERSE) { |