narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

parse pep events only from bare jid

Browse source
This commit is contained in:
Daniel Gultsch 2022-07-22 10:39:18 +02:00
parent dd30951dfb
commit 8027b3be24
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -196,8 +196,8 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
} }
private void parseEvent(final Element event, final Jid from, final Account account) { private void parseEvent(final Element event, final Jid from, final Account account) {
Element items = event.findChild("items"); final Element items = event.findChild("items");
String node = items == null ? null : items.getAttribute("node"); final String node = items == null ? null : items.getAttribute("node");
if ("urn:xmpp:avatar:metadata".equals(node)) { if ("urn:xmpp:avatar:metadata".equals(node)) {
Avatar avatar = Avatar.parseMetadata(items); Avatar avatar = Avatar.parseMetadata(items);
if (avatar != null) { if (avatar != null) {
@ -1000,7 +1000,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
} }
final Element event = original.findChild("event", "http://jabber.org/protocol/pubsub#event"); final Element event = original.findChild("event", "http://jabber.org/protocol/pubsub#event");
if (event != null && InvalidJid.hasValidFrom(original)) { if (event != null && InvalidJid.hasValidFrom(original) && original.getFrom().isBareJid()) {
if (event.hasChild("items")) { if (event.hasChild("items")) {
parseEvent(event, original.getFrom(), account); parseEvent(event, original.getFrom(), account);
} else if (event.hasChild("delete")) { } else if (event.hasChild("delete")) {
@ -1012,6 +1012,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
final String nick = packet.findChildContent("nick", Namespace.NICK); final String nick = packet.findChildContent("nick", Namespace.NICK);
if (nick != null && InvalidJid.hasValidFrom(original)) { if (nick != null && InvalidJid.hasValidFrom(original)) {
if (mXmppConnectionService.isMuc(account, from)) {
return;
}
final Contact contact = account.getRoster().getContact(from); final Contact contact = account.getRoster().getContact(from);
if (contact.setPresenceName(nick)) { if (contact.setPresenceName(nick)) {
mXmppConnectionService.syncRoster(account); mXmppConnectionService.syncRoster(account);