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
committerChristian S <christian@pix-art.de>2015-12-12 15:50:30 +0100
commit751f92fa2d7606fbc78085cb5ff7688b71f21d87 (patch)
tree4a0bd9f3f5db9ccb141921ef956ad30766ac6436 /src/main/java/eu/siacs/conversations/parser/PresenceParser.java
parent911a8ab9e757947560ac4b4b7f1c35d0fda173fa (diff)
when no avatar found show avatar of contact and not the muc user in conferences
Diffstat (limited to '')
-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 b8a2a7e96..d9806dfc7 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");