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

parse §5.1.2 full jids from muc archives for OMEMO messages

Browse source
This commit is contained in:
Daniel Gultsch 2016-06-28 10:33:46 +02:00
parent e63d6b4bf2
commit 8882c6b6fd
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -420,6 +420,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
if (message == null) { if (message == null) {
return; return;
} }
if (conversationMultiMode) {
message.setTrueCounterpart(origin);
}
} else { } else {
message = new Message(conversation, body, Message.ENCRYPTION_NONE, status); message = new Message(conversation, body, Message.ENCRYPTION_NONE, status);
} }
@ -437,11 +440,16 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
message.markable = packet.hasChild("markable", "urn:xmpp:chat-markers:0"); message.markable = packet.hasChild("markable", "urn:xmpp:chat-markers:0");
if (conversationMultiMode) { if (conversationMultiMode) {
final Jid fallback = conversation.getMucOptions().getTrueCounterpart(counterpart); final Jid fallback = conversation.getMucOptions().getTrueCounterpart(counterpart);
Jid trueCounterpart = getTrueCounterpart(query != null ? mucUserElement : null, fallback); Jid trueCounterpart;
if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
trueCounterpart = message.getTrueCounterpart();
} else if (Config.PARSE_REAL_JID_FROM_MUC_MAM) {
trueCounterpart = getTrueCounterpart(query != null ? mucUserElement : null, fallback);
} else {
trueCounterpart = fallback;
}
if (trueCounterpart != null && trueCounterpart.toBareJid().equals(account.getJid().toBareJid())) { if (trueCounterpart != null && trueCounterpart.toBareJid().equals(account.getJid().toBareJid())) {
status = isTypeGroupChat ? Message.STATUS_SEND_RECEIVED : Message.STATUS_SEND; status = isTypeGroupChat ? Message.STATUS_SEND_RECEIVED : Message.STATUS_SEND;
} else {
status = Message.STATUS_RECEIVED;
} }
message.setStatus(status); message.setStatus(status);
message.setTrueCounterpart(trueCounterpart); message.setTrueCounterpart(trueCounterpart);
@ -638,7 +646,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
private static Jid getTrueCounterpart(Element mucUserElement, Jid fallback) { private static Jid getTrueCounterpart(Element mucUserElement, Jid fallback) {
final Element item = mucUserElement == null ? null : mucUserElement.findChild("item"); final Element item = mucUserElement == null ? null : mucUserElement.findChild("item");
Jid result = item == null ? null : item.getAttributeAsJid("jid"); Jid result = item == null ? null : item.getAttributeAsJid("jid");
return result != null && Config.PARSE_REAL_JID_FROM_MUC_MAM ? result : fallback; return result != null ? result : fallback;
} }
private void sendMessageReceipts(Account account, MessagePacket packet) { private void sendMessageReceipts(Account account, MessagePacket packet) {