summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Clayton <alex.clayton@isode.com>2014-11-13 15:15:41 (GMT)
committerAlex Clayton <alex.clayton@isode.com>2014-11-26 09:39:53 (GMT)
commitb89bf2f3363bac56fcc5d02f5fb690c73eaaacdf (patch)
tree39893e33d2bb88f0eef3e04ae9533bb1d6139c17 /src/com/isode/stroke/parser/payloadparsers/MAMQueryParser.java
parent47cad5fd7883b8c7273ea11073643aa585b485c6 (diff)
downloadstroke-b89bf2f3363bac56fcc5d02f5fb690c73eaaacdf.zip
stroke-b89bf2f3363bac56fcc5d02f5fb690c73eaaacdf.tar.bz2
Bring Stroke inline with Swiften with respect to MAM
Some patches for MAM had gone into swiften without being ported to stroke. This patch should bring stroke update to date with Swiften. The swiften patches in question are 9b762e1cf26cfe12cf601d9ea95cf91b3f95c799 -- Add node attribute to MAMQuery 8096f80861667381b777af774cfd446d6fc8cda8 -- Brining XEP-0313 (MAM) implementation in line with version 3.0. Test-information: Ran the updated JUnit tests in Eclipse they all passed ok. Ran make and make test in a stroke checkout. Everything build ok and the JUNit tests passed. Change-Id: I95bf5d598808f48fe2d7af12c0f07d852d68c115
Diffstat (limited to 'src/com/isode/stroke/parser/payloadparsers/MAMQueryParser.java')
-rw-r--r--src/com/isode/stroke/parser/payloadparsers/MAMQueryParser.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/isode/stroke/parser/payloadparsers/MAMQueryParser.java b/src/com/isode/stroke/parser/payloadparsers/MAMQueryParser.java
index fcfd5e4..2543a68 100644
--- a/src/com/isode/stroke/parser/payloadparsers/MAMQueryParser.java
+++ b/src/com/isode/stroke/parser/payloadparsers/MAMQueryParser.java
@@ -24,9 +24,14 @@ public class MAMQueryParser extends GenericPayloadParser<MAMQuery> {
public void handleStartElement(String element, String ns, AttributeMap attributes) {
if (level_ == 0) {
- String attributeValue = attributes.getAttributeValue("queryid");
- if (attributeValue != null) {
- getPayloadInternal().setQueryID(attributeValue);
+ MAMQuery payloadInternal = getPayloadInternal();
+ String queryIDValue = attributes.getAttributeValue("queryid");
+ if (queryIDValue != null) {
+ payloadInternal.setQueryID(queryIDValue);
+ }
+ String nodeValue = attributes.getAttributeValue("node");
+ if (nodeValue != null) {
+ payloadInternal.setNode(nodeValue);
}
} else if (level_ == 1) {
if (element == "x" && ns == "jabber:x:data") {