don't request disco from self

Daniel Gultsch created 9 years ago

Change summary

src/main/java/eu/siacs/conversations/Config.java                | 2 --
src/main/java/eu/siacs/conversations/parser/PresenceParser.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/Config.java

@@ -89,8 +89,6 @@ public final class Config {
 
 	public static final boolean IGNORE_ID_REWRITE_IN_MUC = true;
 
-	public static final boolean REQUEST_DISCO = true;
-
 	public static final long MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000;
 	public static final long MAM_MAX_CATCHUP =  MILLISECONDS_IN_DAY / 2;
 	public static final int MAM_MAX_MESSAGES = 500;

src/main/java/eu/siacs/conversations/parser/PresenceParser.java

@@ -199,7 +199,7 @@ public class PresenceParser extends AbstractParser implements
 			final String message = packet.findChildContent("status");
 			final Presence presence = Presence.parse(show, caps, message);
 			contact.updatePresence(resource, presence);
-			if (presence.hasCaps() && Config.REQUEST_DISCO) {
+			if (presence.hasCaps() && !from.equals(account.getJid())) {
 				mXmppConnectionService.fetchCaps(account, from, presence);
 			}