aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/parser
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-02-22 20:08:58 +0100
committerChristian Schneppe <christian@pix-art.de>2017-02-22 20:49:04 +0100
commit00de4cd49ccfc311207cb8fe926ebc0c118d3e08 (patch)
tree130d49c0efddc98d48532e39489ea50a27ad9425 /src/main/java/de/pixart/messenger/parser
parent72ce4b07c1bd53b1842f213925c9c1f6d5a99003 (diff)
bump mam namespace
Diffstat (limited to 'src/main/java/de/pixart/messenger/parser')
-rw-r--r--src/main/java/de/pixart/messenger/parser/MessageParser.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index b1d67b933..88cdefc8c 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -299,15 +299,16 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
final boolean isForwarded;
boolean isCarbon = false;
String serverMsgId = null;
- final Element fin = original.findChild("fin", "urn:xmpp:mam:0");
+ final Element fin = original.findChild("fin", Xmlns.MAM_LAGECY);
if (fin != null) {
- mXmppConnectionService.getMessageArchiveService().processFin(fin, original.getFrom());
+ mXmppConnectionService.getMessageArchiveService().processFinLagecy(fin, original.getFrom());
return;
}
- final Element result = original.findChild("result", "urn:xmpp:mam:0");
+ final boolean mamLagecy = original.hasChild("result", Xmlns.MAM_LAGECY);
+ final Element result = original.findChild("result", mamLagecy ? Xmlns.MAM_LAGECY : Xmlns.MAM);
final MessageArchiveService.Query query = result == null ? null : mXmppConnectionService.getMessageArchiveService().findQuery(result.getAttribute("queryid"));
if (query != null && query.validFrom(original.getFrom())) {
- Pair<MessagePacket, Long> f = original.getForwardedMessagePacket("result", "urn:xmpp:mam:0");
+ Pair<MessagePacket, Long> f = original.getForwardedMessagePacket("result", mamLagecy ? Xmlns.MAM_LAGECY : Xmlns.MAM);
if (f == null) {
return;
}