aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-04-28 19:02:20 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-04-28 19:02:20 +0200
commit5021b9a5dd2b8ba00682285a6b407641c970236e (patch)
treeb0316ad4acfc5a00976f322c112b9a9bf7fdabdf /src/main/java
parent29616d02a8e97a9044daec286bdfa7c862108fa4 (diff)
don't request disco from self
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/Config.java2
-rw-r--r--src/main/java/eu/siacs/conversations/parser/PresenceParser.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index 1c83d05a..c6d1f0b8 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/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;
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index 5c5ca6be..e6cfa38f 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/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);
}