aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-12-23 21:16:58 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-12-23 21:16:58 +0100
commitd03c431137107e7c8799804293cfaf2fe4138d9a (patch)
treed492e614f3e1d356a34e271c5d8bbbedc10ff357 /src
parent6c10f8a23223816d46bfc8fa40a85b5d3fcabe9c (diff)
use original message to parse pep
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 19c2aa78..87993a45 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -254,9 +254,10 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
mXmppConnectionService.updateAccountUi();
}
} else if (AxolotlService.PEP_DEVICE_LIST.equals(node)) {
- Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account)+"Received PEP device list update from "+ from + ", processing...");
+
Element item = items.findChild("item");
Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(item);
+ Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account)+"Received PEP device list ("+deviceIds+") update from "+ from + ", processing...");
AxolotlService axolotlService = account.getAxolotlService();
axolotlService.registerDevices(from, deviceIds);
mXmppConnectionService.updateAccountUi();
@@ -651,9 +652,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
}
}
- Element event = packet.findChild("event", "http://jabber.org/protocol/pubsub#event");
+ Element event = original.findChild("event", "http://jabber.org/protocol/pubsub#event");
if (event != null) {
- parseEvent(event, from, account);
+ parseEvent(event, original.getFrom(), account);
}
String nick = packet.findChildContent("nick", "http://jabber.org/protocol/nick");