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

1 files changed, 10 insertions, 8 deletions

diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index 4eb4152c..5faf6eaf 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -3,6 +3,7 @@ package eu.siacs.conversations.parser;
 import java.util.ArrayList;
 
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
+import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
 
 import eu.siacs.conversations.crypto.PgpEngine;
 import eu.siacs.conversations.entities.Account;
@@ -11,6 +12,7 @@ import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.MucOptions;
 import eu.siacs.conversations.entities.Presences;
 import eu.siacs.conversations.generator.PresenceGenerator;
+import eu.siacs.conversations.services.AvatarService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.OnPresencePacketReceived;
@@ -36,12 +38,12 @@ public class PresenceParser extends AbstractParser implements
 			mucOptions.processPacket(packet, mPgpEngine);
 			final ArrayList<MucOptions.User> tileUserAfter = new ArrayList<>(mucOptions.getUsers().subList(0,Math.min(mucOptions.getUsers().size(),5)));
 			if (!tileUserAfter.equals(tileUserBefore)) {
-				mXmppConnectionService.getAvatarService().clear(conversation);
+				AvatarService.getInstance().clear(conversation);
 			}
 			if (before != mucOptions.online() || (mucOptions.online() && count != mucOptions.getUsers().size())) {
-				mXmppConnectionService.updateConversationUi();
+				UiUpdateHelper.updateConversationUi();
 			} else if (mucOptions.online()) {
-				mXmppConnectionService.updateMucRosterUi();
+				UiUpdateHelper.updateMucRosterUi();
 			}
 		}
 	}
@@ -62,12 +64,12 @@ public class PresenceParser extends AbstractParser implements
 				avatar.owner = from.toBareJid();
 				if (AvatarUtil.isAvatarCached(avatar)) {
 					if (contact.setAvatar(avatar)) {
-						mXmppConnectionService.getAvatarService().clear(contact);
-						mXmppConnectionService.updateConversationUi();
-						mXmppConnectionService.updateRosterUi();
+						AvatarService.getInstance().clear(contact);
+						UiUpdateHelper.updateConversationUi();
+						UiUpdateHelper.updateRosterUi();
 					}
 				} else {
-					mXmppConnectionService.fetchAvatar(account, avatar);
+					AvatarService.getInstance().fetchAvatar(account, avatar);
 				}
 			}
 			int sizeBefore = contact.getPresences().size();
@@ -97,7 +99,7 @@ public class PresenceParser extends AbstractParser implements
 				contact.setOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST);
 			}
 		}
-		mXmppConnectionService.updateRosterUi();
+		UiUpdateHelper.updateRosterUi();
 	}
 
 	@Override