narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

work with muc services that change the message id

Browse source
This commit is contained in:
Daniel Gultsch 2015-10-14 11:15:18 +02:00
parent beca748634
commit 0587ba2ad2
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/Config.java
View file

@ -50,6 +50,8 @@ public final class Config {
public static final boolean X509_VERIFICATION = false; //use x509 certificates to verify OMEMO keys public static final boolean X509_VERIFICATION = false; //use x509 certificates to verify OMEMO keys
public static final boolean IGNORE_ID_REWRITE_IN_MUC = true;
public static final long MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000; public static final long MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000;
public static final long MAM_MAX_CATCHUP = MILLISECONDS_IN_DAY / 2; public static final long MAM_MAX_CATCHUP = MILLISECONDS_IN_DAY / 2;
public static final int MAM_MAX_MESSAGES = 500; public static final int MAM_MAX_MESSAGES = 500;

2
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -315,7 +315,7 @@ public class MessageParser extends AbstractParser implements
status = Message.STATUS_SEND_RECEIVED; status = Message.STATUS_SEND_RECEIVED;
if (mXmppConnectionService.markMessage(conversation, remoteMsgId, status)) { if (mXmppConnectionService.markMessage(conversation, remoteMsgId, status)) {
return; return;
} else if (remoteMsgId == null) { } else if (remoteMsgId == null || Config.IGNORE_ID_REWRITE_IN_MUC) {
Message message = conversation.findSentMessageWithBody(packet.getBody()); Message message = conversation.findSentMessageWithBody(packet.getBody());
if (message != null) { if (message != null) {
mXmppConnectionService.markMessage(message, status); mXmppConnectionService.markMessage(message, status);