properly clear muc user avatar caches

1 files changed, 4 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 12ffd33f..b8a2a7e9 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -35,7 +35,7 @@ public class PresenceParser extends AbstractParser implements
 			processConferencePresence(packet, mucOptions);
 			final List<MucOptions.User> tileUserAfter = mucOptions.getUsers(5);
 			if (!tileUserAfter.equals(tileUserBefore)) {
-				mXmppConnectionService.getAvatarService().clear(conversation);
+				mXmppConnectionService.getAvatarService().clear(mucOptions);
 			}
 			if (before != mucOptions.online() || (mucOptions.online() && count != mucOptions.getUserCount())) {
 				mXmppConnectionService.updateConversationUi();
@@ -86,7 +86,9 @@ public class PresenceParser extends AbstractParser implements
 						if (avatar != null) {
 							avatar.owner = from;
 							if (mXmppConnectionService.getFileBackend().isAvatarCached(avatar)) {
-								user.setAvatar(avatar);
+								if (user.setAvatar(avatar)) {
+									mXmppConnectionService.getAvatarService().clear(user);
+								}
 							} else {
 								mXmppConnectionService.fetchAvatar(mucOptions.getAccount(), avatar);
 							}