Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 00:02:06 +01:00
Code Issues Releases Wiki Activity

Make ServiceDiscoveryManager.findService() consider all services

Browse source 
with the same matching feature announced.

Consider for example PubSub where usually the service itself announces
the PubSub feature as part of PEP, and where an additional PubSub
component exists. The old logic will just lookup the first matching
service with a PubSub feature announcement and check if for a matching
identiy. If we look for a real PubSub service, but stumble first over
user's service with PEP, then findService() will return 'null' although
there would have been a valid PubSub service.

Fixes SMACK-805.
This commit is contained in:
Florian Schmaus 2018-02-21 19:55:01 +01:00
parent 64f41364f9
commit 98708d67a2
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
View file

@ -1,6 +1,6 @@
/** /**
* *
* Copyright 2003-2007 Jive Software. * Copyright 2003-2007 Jive Software, 2018 Florian Schmaus.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -43,6 +43,7 @@ import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.Objects;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.caps.EntityCapsManager; import org.jivesoftware.smackx.caps.EntityCapsManager;
import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
@ -66,6 +67,7 @@ import org.jxmpp.util.cache.ExpirationCache;
* </ol> * </ol>
* *
* @author Gaston Dombiak * @author Gaston Dombiak
* @author Florian Schmaus
*/ */
public final class ServiceDiscoveryManager extends Manager { public final class ServiceDiscoveryManager extends Manager {
@ -875,20 +877,26 @@ public final class ServiceDiscoveryManager extends Manager {
public DomainBareJid findService(String feature, boolean useCache, String category, String type) public DomainBareJid findService(String feature, boolean useCache, String category, String type)
throws NoResponseException, XMPPErrorException, NotConnectedException, throws NoResponseException, XMPPErrorException, NotConnectedException,
InterruptedException { InterruptedException {
List<DiscoverInfo> services = findServicesDiscoverInfo(feature, true, useCache); boolean noCategory = StringUtils.isNullOrEmpty(category);
boolean noType = StringUtils.isNullOrEmpty(type);
if (noType != noCategory) {
throw new IllegalArgumentException("Must specify either both, category and type, or none");
}
List<DiscoverInfo> services = findServicesDiscoverInfo(feature, false, useCache);
if (services.isEmpty()) { if (services.isEmpty()) {
return null; return null;
} }
DiscoverInfo info = services.get(0);
if (category != null && type != null) { if (!noCategory && !noType) {
if (!info.hasIdentity(category, type)) { for (DiscoverInfo info : services) {
return null; if (info.hasIdentity(category, type)) {
return info.getFrom().asDomainBareJid();
}
} }
} }
else if (category != null || type != null) {
throw new IllegalArgumentException("Must specify either both, category and type, or none"); return services.get(0).getFrom().asDomainBareJid();
}
return info.getFrom().asDomainBareJid();
} }
public DomainBareJid findService(String feature, boolean useCache) throws NoResponseException, public DomainBareJid findService(String feature, boolean useCache) throws NoResponseException,