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

don't request disco from self

Browse source
This commit is contained in:
Daniel Gultsch 2016-04-28 19:02:20 +02:00
parent 29616d02a8
commit 5021b9a5dd
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/Config.java
View file

@ -89,8 +89,6 @@ public final class Config {
public static final boolean IGNORE_ID_REWRITE_IN_MUC = true; 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 MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000;
public static final long MAM_MAX_CATCHUP = MILLISECONDS_IN_DAY / 2; public static final long MAM_MAX_CATCHUP = MILLISECONDS_IN_DAY / 2;
public static final int MAM_MAX_MESSAGES = 500; public static final int MAM_MAX_MESSAGES = 500;

2
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
View file

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