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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
index 9df70c1e..fc764a88 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
@@ -7,6 +7,7 @@ import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Contact;
+import de.thedevstack.conversationsplus.services.AvatarService;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.Xmlns;
 import de.thedevstack.conversationsplus.xml.Element;
@@ -50,14 +51,14 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 						contact.parseSubscriptionFromElement(item);
 					}
 				}
-				mXmppConnectionService.getAvatarService().clear(contact);
+				AvatarService.getInstance().clear(contact);
 			}
 		}
 		mXmppConnectionService.updateConversationUi();
 		mXmppConnectionService.updateRosterUi();
 	}
 
-	public String avatarData(final IqPacket packet) {
+	public static String avatarData(final IqPacket packet) {
 		final Element pubsub = packet.findChild("pubsub",
 				"http://jabber.org/protocol/pubsub");
 		if (pubsub == null) {
@@ -67,7 +68,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 		if (items == null) {
 			return null;
 		}
-		return super.avatarData(items);
+		return AbstractParser.avatarData(items);
 	}
 
 	@Override