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, 2 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
index 822234c7..601ddedc 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
@@ -25,6 +25,7 @@ import android.widget.Toast;
 
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
+import de.thedevstack.conversationsplus.services.AvatarService;
 import de.thedevstack.conversationsplus.services.XmppConnectionService.OnAccountUpdate;
 import de.thedevstack.conversationsplus.ui.adapter.KnownHostsAdapter;
 import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
@@ -157,7 +158,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 						&& mAccount.getStatus() == Account.State.ONLINE) {
 					if (!mFetchingAvatar) {
 						mFetchingAvatar = true;
-						xmppConnectionService.checkForAvatar(mAccount,
+						AvatarService.getInstance().checkForAvatar(mAccount,
 								mAvatarFetchCallback);
 					}
 				} else {
@@ -427,7 +428,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		}
 		if (this.jidToEdit != null) {
 			this.mAvatar.setVisibility(View.VISIBLE);
-			this.mAvatar.setImageBitmap(avatarService().get(this.mAccount, getPixel(72)));
+			this.mAvatar.setImageBitmap(AvatarService.getInstance().get(this.mAccount, getPixel(72)));
 		}
 		if (this.mAccount.isOptionSet(Account.OPTION_REGISTER)) {
 			this.mRegisterNew.setVisibility(View.VISIBLE);