aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-12-09 10:30:26 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-12-09 10:30:26 +0100
commit11e58607c93f152aad82cfe7951355e03274bf47 (patch)
tree0a6bd88218489a7b3c9c0e011fb67510da83f51e /src/main/java/eu/siacs/conversations/parser/PresenceParser.java
parentaea664a0eca8c6f4c2c7113563d7bb5201787c61 (diff)
when no avatar found show avatar of contact and not the muc user in conferences
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser/PresenceParser.java')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/PresenceParser.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index b8a2a7e9..d9806dfc 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -110,7 +110,10 @@ public class PresenceParser extends AbstractParser implements
mucOptions.setError(MucOptions.ERROR_UNKNOWN);
}
} else if (!from.isBareJid()){
- mucOptions.deleteUser(from.getResourcepart());
+ MucOptions.User user = mucOptions.deleteUser(from.getResourcepart());
+ if (user != null) {
+ mXmppConnectionService.getAvatarService().clear(user);
+ }
}
} else if (type.equals("error")) {
Element error = packet.findChild("error");