moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-24 01:32:17 -05:00
Code Issues Releases Wiki Activity

use original message to parse pep

Browse Source
This commit is contained in:
Daniel Gultsch 2016-12-23 21:16:58 +01:00
parent 6c10f8a232
commit d03c431137
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

@ -254,9 +254,10 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
mXmppConnectionService.updateAccountUi(); mXmppConnectionService.updateAccountUi();
} }
} else if (AxolotlService.PEP_DEVICE_LIST.equals(node)) { } 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"); Element item = items.findChild("item");
Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(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 axolotlService = account.getAxolotlService();
axolotlService.registerDevices(from, deviceIds); axolotlService.registerDevices(from, deviceIds);
mXmppConnectionService.updateAccountUi(); 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) { if (event != null) {
parseEvent(event, from, account); parseEvent(event, original.getFrom(), account);
} }
String nick = packet.findChildContent("nick", "http://jabber.org/protocol/nick"); String nick = packet.findChildContent("nick", "http://jabber.org/protocol/nick");