aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-13 11:20:27 +0200
committerChristian Schneppe <christian@pix-art.de>2016-05-13 21:56:28 +0200
commit763383a88f04338f8bbd65014284197270ee9a46 (patch)
tree22f8b476dc8547d75146926b0f6f5f9591d2bd9a /src/main/java/eu
parentfb5bd2488b7ca50b09bd8f561bcd14ad65a67893 (diff)
do not process self presence
we don't want our own resource show up in the self contact
Diffstat (limited to 'src/main/java/eu')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/PresenceParser.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index c6b234590..aea9002ac 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -171,7 +171,7 @@ public class PresenceParser extends AbstractParser implements
public void parseContactPresence(final PresencePacket packet, final Account account) {
final PresenceGenerator mPresenceGenerator = mXmppConnectionService.getPresenceGenerator();
final Jid from = packet.getFrom();
- if (from == null) {
+ if (from == null || from.equals(account.getJid())) {
return;
}
final String type = packet.getAttribute("type");
@@ -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() && !from.equals(account.getJid())) {
+ if (presence.hasCaps()) {
mXmppConnectionService.fetchCaps(account, from, presence);
}