aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-12-25 18:40:36 +0100
committerChristian Schneppe <christian@pix-art.de>2016-12-25 18:40:36 +0100
commit9867e3b1fc9ef6ac9a3fc851dc001478177b80d7 (patch)
tree17010319888a0632fb80ab6e15ae6bd5d7b836e5 /src/main/java/de
parente5d386162fa9d497f6d09fbc33222eab61fcd3d3 (diff)
use original message to parse pep
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/parser/MessageParser.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index 227fb9e11..69c2faff9 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -255,9 +255,9 @@ 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();
@@ -645,9 +645,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");