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, 3 insertions, 3 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
index 4e361c67..b6d861d4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
@@ -20,8 +20,8 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.concurrent.RejectedExecutionException;
 
-import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.services.AvatarService;
 import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.R;
@@ -146,7 +146,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 
 		@Override
 		protected Bitmap doInBackground(Conversation... params) {
-			return activity.avatarService().get(params[0], activity.getPixel(56));
+			return AvatarService.getInstance().get(params[0], activity.getPixel(56));
 		}
 
 		@Override
@@ -163,7 +163,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 
 	public void loadAvatar(Conversation conversation, ImageView imageView) {
 		if (cancelPotentialWork(conversation, imageView)) {
-			final Bitmap bm = activity.avatarService().get(conversation, activity.getPixel(56), true);
+			final Bitmap bm = AvatarService.getInstance().get(conversation, activity.getPixel(56), true);
 			if (bm != null) {
 				imageView.setImageBitmap(bm);
 				imageView.setBackgroundColor(0x00000000);