1 files changed, 7 insertions, 5 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
index 4b6ed240..a8fa0128 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
@@ -5,9 +5,11 @@ import android.util.Pair;
 
 import de.thedevstack.conversationsplus.entities.FileParams;
 import de.thedevstack.conversationsplus.enums.FileStatus;
+import de.thedevstack.conversationsplus.services.avatar.AvatarCache;
 import de.thedevstack.conversationsplus.services.filetransfer.http.download.AutomaticFileDownload;
 import de.thedevstack.conversationsplus.services.filetransfer.http.download.HttpRetrieveHead;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
+import de.thedevstack.conversationsplus.xmpp.avatar.AvatarPacketParser;
 import de.thedevstack.conversationsplus.xmpp.httpuploadim.HttpUploadHint;
 import de.tzur.conversations.Settings;
 
@@ -31,7 +33,7 @@ import de.thedevstack.conversationsplus.entities.Contact;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.entities.MucOptions;
-import de.thedevstack.conversationsplus.services.AvatarService;
+import de.thedevstack.conversationsplus.services.avatar.AvatarService;
 import de.thedevstack.conversationsplus.services.MessageArchiveService;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
@@ -188,7 +190,7 @@ public class MessageParser extends AbstractParser implements
 		Element items = event.findChild("items");
 		String node = items == null ? null : items.getAttribute("node");
 		if ("urn:xmpp:avatar:metadata".equals(node)) {
-			Avatar avatar = Avatar.parseMetadata(items);
+			Avatar avatar = AvatarPacketParser.parseMetadata(items);
 			if (avatar != null) {
 				avatar.owner = from.toBareJid();
 				if (AvatarUtil.isAvatarCached(avatar)) {
@@ -196,13 +198,13 @@ public class MessageParser extends AbstractParser implements
 						if (account.setAvatar(avatar.getFilename())) {
 							mXmppConnectionService.databaseBackend.updateAccount(account);
 						}
-						AvatarService.getInstance().clear(account);
+						AvatarCache.clear(account);
 						mXmppConnectionService.updateConversationUi();
 						mXmppConnectionService.updateAccountUi();
 					} else {
 						Contact contact = account.getRoster().getContact(from);
 						contact.setAvatar(avatar);
-						AvatarService.getInstance().clear(contact);
+						AvatarCache.clear(contact);
 						mXmppConnectionService.updateConversationUi();
 						mXmppConnectionService.updateRosterUi();
 					}
@@ -216,7 +218,7 @@ public class MessageParser extends AbstractParser implements
 			if (nick != null && nick.getContent() != null) {
 				Contact contact = account.getRoster().getContact(from);
 				contact.setPresenceName(nick.getContent());
-				AvatarService.getInstance().clear(account);
+				AvatarCache.clear(account);
 				mXmppConnectionService.updateConversationUi();
 				mXmppConnectionService.updateAccountUi();
 			}