diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-03-04 17:05:47 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-03-04 17:05:47 +0100 |
commit | cedc4305c20aa76aa6ffa9a5443578e57023e1ca (patch) | |
tree | 62ffe4ed374e029385659d64919b144ea64626a7 /src/main/java/de/pixart/messenger/parser/MessageParser.java | |
parent | a2a9ce1caeabed2e29f702933f1fd18d949b75ec (diff) |
rename the Xmlns class to Namespace
Diffstat (limited to 'src/main/java/de/pixart/messenger/parser/MessageParser.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/parser/MessageParser.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java index be44d967b..ba8995108 100644 --- a/src/main/java/de/pixart/messenger/parser/MessageParser.java +++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java @@ -31,7 +31,7 @@ import de.pixart.messenger.http.HttpConnectionManager; import de.pixart.messenger.services.MessageArchiveService; import de.pixart.messenger.services.XmppConnectionService; import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.Xmlns; +import de.pixart.messenger.utils.Namespace; import de.pixart.messenger.xml.Element; import de.pixart.messenger.xmpp.OnMessagePacketReceived; import de.pixart.messenger.xmpp.chatstate.ChatState; @@ -215,7 +215,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece private static String extractStanzaId(Element packet, Jid by) { for (Element child : packet.getChildren()) { if (child.getName().equals("stanza-id") - && Xmlns.STANZA_IDS.equals(child.getNamespace()) + && Namespace.STANZA_IDS.equals(child.getNamespace()) && by.equals(child.getAttributeAsJid("by"))) { return child.getAttribute("id"); } @@ -299,16 +299,16 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece final boolean isForwarded; boolean isCarbon = false; String serverMsgId = null; - final Element fin = original.findChild("fin", Xmlns.MAM_LEGACY); + final Element fin = original.findChild("fin", Namespace.MAM_LEGACY); if (fin != null) { mXmppConnectionService.getMessageArchiveService().processFinLegacy(fin, original.getFrom()); return; } - final boolean mamlegacy = original.hasChild("result", Xmlns.MAM_LEGACY); - final Element result = original.findChild("result", mamlegacy ? Xmlns.MAM_LEGACY : Xmlns.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<MessagePacket, Long> f = original.getForwardedMessagePacket("result", mamlegacy ? Xmlns.MAM_LEGACY : Xmlns.MAM); + Pair<MessagePacket, Long> f = original.getForwardedMessagePacket("result", mamlegacy ? Namespace.MAM_LEGACY : Namespace.MAM); if (f == null) { return; } @@ -442,7 +442,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece final boolean safeToExtract; if (isTypeGroupChat) { by = conversation.getJid().toBareJid(); - safeToExtract = conversation.getMucOptions().hasFeature(Xmlns.STANZA_IDS); + safeToExtract = conversation.getMucOptions().hasFeature(Namespace.STANZA_IDS); } else { by = account.getJid().toBareJid(); safeToExtract = account.getXmppConnection().getFeatures().stanzaIds(); |