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

2 files changed, 78 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/UiUpdateHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/UiUpdateHelper.java
new file mode 100644
index 00000000..7638caad
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/UiUpdateHelper.java
@@ -0,0 +1,52 @@
+package de.thedevstack.conversationsplus.utils;
+
+import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.services.XmppConnectionService;
+
+/**
+ * Helper class to avoid passing the xmppConnectionService to everywhere just to update the UI.
+ * TODO: Make even this helper class work without XmppConnectionService
+ */
+public class UiUpdateHelper {
+    private static XmppConnectionService xmppConnectionService;
+
+    public static void initXmppConnectionService(XmppConnectionService xmppConnectionService) {
+        if (null == UiUpdateHelper.xmppConnectionService) {
+            UiUpdateHelper.xmppConnectionService = xmppConnectionService;
+        } else {
+            Logging.e("UiUpdateHelper", "XMPP Connection Service already instantiated.");
+        }
+    }
+
+    public static void updateConversationUi() {
+        if (null != UiUpdateHelper.xmppConnectionService) {
+            UiUpdateHelper.xmppConnectionService.updateConversationUi();
+        } else {
+            Logging.e("UiUpdateHelper", "XMPP Connection Service not initialized. Conversation Ui not updated.");
+        }
+    }
+
+    public static void updateAccountUi() {
+        if (null != UiUpdateHelper.xmppConnectionService) {
+            UiUpdateHelper.xmppConnectionService.updateAccountUi();
+        } else {
+            Logging.e("UiUpdateHelper", "XMPP Connection Service not initialized. Account Ui not updated.");
+        }
+    }
+
+    public static void updateRosterUi() {
+        if (null != UiUpdateHelper.xmppConnectionService) {
+            UiUpdateHelper.xmppConnectionService.updateRosterUi();
+        } else {
+            Logging.e("UiUpdateHelper", "XMPP Connection Service not initialized. Roster Ui not updated.");
+        }
+    }
+
+    public static void updateMucRosterUi() {
+        if (null != UiUpdateHelper.xmppConnectionService) {
+            UiUpdateHelper.xmppConnectionService.updateMucRosterUi();
+        } else {
+            Logging.e("UiUpdateHelper", "XMPP Connection Service not initialized. MUC Roster Ui not updated.");
+        }
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/XmppSendUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/XmppSendUtil.java
new file mode 100644
index 00000000..eb3c5da4
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/XmppSendUtil.java
@@ -0,0 +1,26 @@
+package de.thedevstack.conversationsplus.utils;
+
+import de.thedevstack.conversationsplus.entities.Account;
+import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
+import de.thedevstack.conversationsplus.xmpp.XmppConnection;
+import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
+import de.thedevstack.conversationsplus.xmpp.stanzas.PresencePacket;
+
+/**
+ * Created by tzur on 09.01.2016.
+ */
+public class XmppSendUtil {
+    public static void sendIqPacket(Account account, IqPacket packet, OnIqPacketReceived callback) {
+        final XmppConnection connection = account.getXmppConnection();
+        if (connection != null) {
+            connection.sendIqPacket(packet, callback);
+        }
+    }
+
+    public static void sendPresencePacket(Account account, PresencePacket packet) {
+        XmppConnection connection = account.getXmppConnection();
+        if (connection != null) {
+            connection.sendPresencePacket(packet);
+        }
+    }
+}