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, 181 insertions, 8 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java b/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
index 83aa83e3..710d5bbd 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
@@ -8,18 +8,32 @@ import android.graphics.Typeface;
 import android.net.Uri;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
+import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.Config;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Bookmark;
 import de.thedevstack.conversationsplus.entities.Contact;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.ListItem;
 import de.thedevstack.conversationsplus.entities.MucOptions;
+import de.thedevstack.conversationsplus.generator.IqGenerator;
+import de.thedevstack.conversationsplus.parser.IqParser;
+import de.thedevstack.conversationsplus.persistance.DatabaseBackend;
+import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.utils.UIHelper;
+import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
+import de.thedevstack.conversationsplus.utils.XmppSendUtil;
+import de.thedevstack.conversationsplus.xml.Element;
+import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
+import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 public class AvatarService {
 
@@ -31,14 +45,14 @@ public class AvatarService {
 	private static final String PREFIX_CONVERSATION = "conversation";
 	private static final String PREFIX_ACCOUNT = "account";
 	private static final String PREFIX_GENERIC = "generic";
+    private static final AvatarService INSTANCE = new AvatarService();
 
-	final private ArrayList<Integer> sizes = new ArrayList<>();
-
-	protected XmppConnectionService mXmppConnectionService = null;
-
-	public AvatarService(XmppConnectionService service) {
-		this.mXmppConnectionService = service;
-	}
+    final private ArrayList<Integer> sizes = new ArrayList<>();
+	private final List<String> mInProgressAvatarFetches = new ArrayList<>();
+    
+    public static AvatarService getInstance() {
+        return INSTANCE;
+    }
 
 	private Bitmap get(final Contact contact, final int size, boolean cachedOnly) {
 		final String KEY = key(contact, size);
@@ -255,7 +269,7 @@ public class AvatarService {
 		textPaint.getTextBounds(letter, 0, 1, rect);
 		float width = textPaint.measureText(letter);
 		canvas.drawText(letter, (right + left) / 2 - width / 2, (top + bottom)
-				/ 2 + rect.height() / 2, textPaint);
+                / 2 + rect.height() / 2, textPaint);
 	}
 
 	private void drawTile(Canvas canvas, MucOptions.User user, int left,
@@ -288,4 +302,163 @@ public class AvatarService {
 		canvas.drawBitmap(bm, null, dst, null);
 	}
 
+    private static String generateFetchKey(Account account, final Avatar avatar) {
+        return account.getJid().toBareJid()+"_"+avatar.owner+"_"+avatar.sha1sum;
+    }
+
+	public void fetchAvatar(Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
+		final String KEY = generateFetchKey(account, avatar);
+		synchronized(this.mInProgressAvatarFetches) {
+			if (this.mInProgressAvatarFetches.contains(KEY)) {
+				return;
+			} else {
+				switch (avatar.origin) {
+					case PEP:
+						this.mInProgressAvatarFetches.add(KEY);
+						fetchAvatarPep(account, avatar, callback);
+						break;
+					case VCARD:
+						this.mInProgressAvatarFetches.add(KEY);
+						fetchAvatarVcard(account, avatar, callback);
+						break;
+				}
+			}
+		}
+	}
+
+	private void fetchAvatarPep(final Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
+		IqPacket packet = IqGenerator.retrievePepAvatar(avatar);
+        XmppSendUtil.sendIqPacket(account, packet, new OnIqPacketReceived() {
+
+            @Override
+            public void onIqPacketReceived(Account account, IqPacket result) {
+                synchronized (mInProgressAvatarFetches) {
+                    mInProgressAvatarFetches.remove(generateFetchKey(account, avatar));
+                }
+                final String ERROR = account.getJid().toBareJid()
+                        + ": fetching avatar for " + avatar.owner + " failed ";
+                if (result.getType() == IqPacket.TYPE.RESULT) {
+                    avatar.image = IqParser.avatarData(result);
+                    if (avatar.image != null) {
+                        if (AvatarUtil.save(avatar)) {
+                            if (account.getJid().toBareJid().equals(avatar.owner)) {
+                                if (account.setAvatar(avatar.getFilename())) {
+                                    DatabaseBackend.getInstance(ConversationsPlusApplication.getAppContext()).updateAccount(account);
+                                }
+                                AvatarService.this.clear(account);
+                                UiUpdateHelper.updateConversationUi();
+								UiUpdateHelper.updateAccountUi();
+                            } else {
+                                Contact contact = account.getRoster()
+                                        .getContact(avatar.owner);
+                                contact.setAvatar(avatar);
+                                AvatarService.this.clear(contact);
+								UiUpdateHelper.updateConversationUi();
+								UiUpdateHelper.updateRosterUi();
+                            }
+                            if (callback != null) {
+                                callback.success(avatar);
+                            }
+                            Logging.d(Config.LOGTAG, account.getJid().toBareJid()
+                                    + ": succesfuly fetched pep avatar for " + avatar.owner);
+                            return;
+                        }
+                    } else {
+
+                        Logging.d(Config.LOGTAG, ERROR + "(parsing error)");
+                    }
+                } else {
+                    Element error = result.findChild("error");
+                    if (error == null) {
+                        Logging.d(Config.LOGTAG, ERROR + "(server error)");
+                    } else {
+                        Logging.d(Config.LOGTAG, ERROR + error.toString());
+                    }
+                }
+                if (callback != null) {
+                    callback.error(0, null);
+                }
+
+            }
+        });
+	}
+
+	private void fetchAvatarVcard(final Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
+		IqPacket packet = IqGenerator.retrieveVcardAvatar(avatar);
+        XmppSendUtil.sendIqPacket(account, packet, new OnIqPacketReceived() {
+            @Override
+            public void onIqPacketReceived(Account account, IqPacket packet) {
+                synchronized (mInProgressAvatarFetches) {
+                    mInProgressAvatarFetches.remove(generateFetchKey(account, avatar));
+                }
+                if (packet.getType() == IqPacket.TYPE.RESULT) {
+                    Element vCard = packet.findChild("vCard", "vcard-temp");
+                    Element photo = vCard != null ? vCard.findChild("PHOTO") : null;
+                    String image = photo != null ? photo.findChildContent("BINVAL") : null;
+                    if (image != null) {
+                        avatar.image = image;
+                        if (AvatarUtil.save(avatar)) {
+                            Logging.d(Config.LOGTAG, account.getJid().toBareJid()
+                                    + ": successfully fetched vCard avatar for " + avatar.owner);
+                            Contact contact = account.getRoster()
+                                    .getContact(avatar.owner);
+                            contact.setAvatar(avatar);
+                            AvatarService.this.clear(contact);
+							UiUpdateHelper.updateConversationUi();
+							UiUpdateHelper.updateRosterUi();
+                        }
+                    }
+                }
+            }
+        });
+	}
+
+	public void checkForAvatar(Account account, final UiCallback<Avatar> callback) {
+		IqPacket packet = IqGenerator.retrieveAvatarMetaData(null);
+		XmppSendUtil.sendIqPacket(account, packet, new OnIqPacketReceived() {
+
+            @Override
+            public void onIqPacketReceived(Account account, IqPacket packet) {
+                if (packet.getType() == IqPacket.TYPE.RESULT) {
+                    Element pubsub = packet.findChild("pubsub",
+                            "http://jabber.org/protocol/pubsub");
+                    if (pubsub != null) {
+                        Element items = pubsub.findChild("items");
+                        if (items != null) {
+                            Avatar avatar = Avatar.parseMetadata(items);
+                            if (avatar != null) {
+                                avatar.owner = account.getJid().toBareJid();
+                                if (AvatarUtil.isAvatarCached(avatar)) {
+                                    if (account.setAvatar(avatar.getFilename())) {
+                                        DatabaseBackend.getInstance(ConversationsPlusApplication.getAppContext()).updateAccount(account);
+                                    }
+                                    AvatarService.this.clear(account);
+                                    callback.success(avatar);
+                                } else {
+                                    fetchAvatarPep(account, avatar, callback);
+                                }
+                                return;
+                            }
+                        }
+                    }
+                }
+                callback.error(0, null);
+            }
+        });
+	}
+
+	public void fetchAvatar(Account account, Avatar avatar) {
+		fetchAvatar(account, avatar, null);
+	}
+
+	public void clearFetchInProgress(Account account) {
+		synchronized (this.mInProgressAvatarFetches) {
+			for(Iterator<String> iterator = this.mInProgressAvatarFetches.iterator(); iterator.hasNext();) {
+				final String KEY = iterator.next();
+				if (KEY.startsWith(account.getJid().toBareJid()+"_")) {
+					iterator.remove();
+				}
+			}
+		}
+	}
 }