Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java
index 241daabb..94047b5d 100644
--- a/src/main/java/eu/siacs/conversations/parser/IqParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java
@@ -8,6 +8,7 @@ import de.thedevstack.android.logcat.Logging;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
+import eu.siacs.conversations.services.AvatarService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.Xmlns;
 import eu.siacs.conversations.xml.Element;
@@ -51,14 +52,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) {
@@ -68,7 +69,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 		if (items == null) {
 			return null;
 		}
-		return super.avatarData(items);
+		return AbstractParser.avatarData(items);
 	}
 
 	@Override