1 files changed, 13 insertions, 10 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index a07b42a9..bbb21c84 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -4,6 +4,8 @@ import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.List;
+import de.thedevstack.conversationsplus.utils.AvatarUtil;
+import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
 
 
 import eu.siacs.conversations.Config;
@@ -15,6 +17,7 @@ import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.entities.MucOptions;
 import eu.siacs.conversations.entities.Presences;
 import eu.siacs.conversations.generator.PresenceGenerator;
+import eu.siacs.conversations.services.AvatarService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.OnPresencePacketReceived;
@@ -39,13 +42,13 @@ public class PresenceParser extends AbstractParser implements
 			processConferencePresence(packet, mucOptions);
 			final List<MucOptions.User> tileUserAfter = mucOptions.getUsers(5);
 			if (!tileUserAfter.equals(tileUserBefore)) {
-				Log.d(Config.LOGTAG,account.getJid().toBareJid()+": update tiles for "+conversation.getName());
-				mXmppConnectionService.getAvatarService().clear(mucOptions);
+				Loggin.d(Config.LOGTAG,account.getJid().toBareJid()+": update tiles for "+conversation.getName());
+				AvatarService.getInstance().clear(conversation);
 			}
 			if (before != mucOptions.online() || (mucOptions.online() && count != mucOptions.getUserCount())) {
-				mXmppConnectionService.updateConversationUi();
+				UiUpdateHelper.updateConversationUi();
 			} else if (mucOptions.online()) {
-				mXmppConnectionService.updateMucRosterUi();
+				UiUpdateHelper.updateMucRosterUi();
 			}
 		}
 	}
@@ -172,14 +175,14 @@ public class PresenceParser extends AbstractParser implements
 			Avatar avatar = Avatar.parsePresence(packet.findChild("x", "vcard-temp:x:update"));
 			if (avatar != null && !contact.isSelf()) {
 				avatar.owner = from.toBareJid();
-				if (mXmppConnectionService.getFileBackend().isAvatarCached(avatar)) {
+				if (AvatarUtil.isAvatarCached(avatar)) {
 					if (contact.setAvatar(avatar)) {
-						mXmppConnectionService.getAvatarService().clear(contact);
-						mXmppConnectionService.updateConversationUi();
-						mXmppConnectionService.updateRosterUi();
+						AvatarService.getInstance().clear(contact);
+						UiUpdateHelper.updateConversationUi();
+						UiUpdateHelper.updateRosterUi();
 					}
 				} else {
-					mXmppConnectionService.fetchAvatar(account, avatar);
+					AvatarService.getInstance().fetchAvatar(account, avatar);
 				}
 			}
 			int sizeBefore = contact.getPresences().size();
@@ -222,7 +225,7 @@ public class PresenceParser extends AbstractParser implements
 				}
 			}
 		}
-		mXmppConnectionService.updateRosterUi();
+		UiUpdateHelper.updateRosterUi();
 	}
 
 	@Override