From 867afe4c5b888ce3f4f9a867906cc8edb86e7aba Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Sun, 6 Aug 2017 01:15:13 +0200
Subject: avatar handling refactored

---
 .../thedevstack/conversationsplus/parser/IqParser.java | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

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

diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
index e13936c5..8af05df5 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
@@ -27,7 +27,8 @@ import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.crypto.axolotl.AxolotlService;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Contact;
-import de.thedevstack.conversationsplus.services.AvatarService;
+import de.thedevstack.conversationsplus.services.avatar.AvatarCache;
+import de.thedevstack.conversationsplus.services.avatar.AvatarService;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.Xmlns;
 import de.thedevstack.conversationsplus.xml.Element;
@@ -71,26 +72,13 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 						contact.parseSubscriptionFromElement(item);
 					}
 				}
-				AvatarService.getInstance().clear(contact);
+				AvatarCache.clear(contact);
 			}
 		}
 		mXmppConnectionService.updateConversationUi();
 		mXmppConnectionService.updateRosterUi();
 	}
 
-	public String avatarData(final IqPacket packet) {
-		final Element pubsub = packet.findChild("pubsub",
-				"http://jabber.org/protocol/pubsub");
-		if (pubsub == null) {
-			return null;
-		}
-		final Element items = pubsub.findChild("items");
-		if (items == null) {
-			return null;
-		}
-		return super.avatarData(items);
-	}
-
 	public Element getItem(final IqPacket packet) {
 		final Element pubsub = packet.findChild("pubsub",
 				"http://jabber.org/protocol/pubsub");
-- 
cgit v1.2.3