From 8644c4676a5fda9d642244ff70e72c5fe524a24d Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Wed, 13 Jan 2016 16:10:09 +0100
Subject: Moved all avatar related work to AvatarService - fetchAvatar,
 fetchAvatarPep, fetchAvatarVcard, checkForAvatar moved from
 XmppConnectionService to AvatarService - Several unused imports removed -
 XmppSendUtil introduced to enable presencePacket and iqPacket sending without
 using XmppConnectionService since the account has everything needed -
 UiUpdateHelper introduced to enable UI updates without using
 XmppConnectionService directly

---
 .../de/thedevstack/conversationsplus/parser/MessageParser.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
index 721f1a23..85c38e12 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
@@ -14,6 +14,7 @@ import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.entities.MucOptions;
 import de.thedevstack.conversationsplus.http.HttpConnectionManager;
+import de.thedevstack.conversationsplus.services.AvatarService;
 import de.thedevstack.conversationsplus.services.MessageArchiveService;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
@@ -148,18 +149,18 @@ public class MessageParser extends AbstractParser implements
 						if (account.setAvatar(avatar.getFilename())) {
 							mXmppConnectionService.databaseBackend.updateAccount(account);
 						}
-						mXmppConnectionService.getAvatarService().clear(account);
+						AvatarService.getInstance().clear(account);
 						mXmppConnectionService.updateConversationUi();
 						mXmppConnectionService.updateAccountUi();
 					} else {
 						Contact contact = account.getRoster().getContact(from);
 						contact.setAvatar(avatar);
-						mXmppConnectionService.getAvatarService().clear(contact);
+						AvatarService.getInstance().clear(contact);
 						mXmppConnectionService.updateConversationUi();
 						mXmppConnectionService.updateRosterUi();
 					}
 				} else {
-					mXmppConnectionService.fetchAvatar(account, avatar);
+					AvatarService.getInstance().fetchAvatar(account, avatar);
 				}
 			}
 		} else if ("http://jabber.org/protocol/nick".equals(node)) {
@@ -168,7 +169,7 @@ public class MessageParser extends AbstractParser implements
 			if (nick != null) {
 				Contact contact = account.getRoster().getContact(from);
 				contact.setPresenceName(nick.getContent());
-				mXmppConnectionService.getAvatarService().clear(account);
+				AvatarService.getInstance().clear(account);
 				mXmppConnectionService.updateConversationUi();
 				mXmppConnectionService.updateAccountUi();
 			}
-- 
cgit v1.2.3