Compilation errors and merge mixups fixed

1 files changed, 7 insertions, 5 deletions

diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index bbb21c84..d55101da 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -4,6 +4,8 @@ import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
 
@@ -42,7 +44,7 @@ public class PresenceParser extends AbstractParser implements
 			processConferencePresence(packet, mucOptions);
 			final List<MucOptions.User> tileUserAfter = mucOptions.getUsers(5);
 			if (!tileUserAfter.equals(tileUserBefore)) {
-				Loggin.d(Config.LOGTAG,account.getJid().toBareJid()+": update tiles for "+conversation.getName());
+				Logging.d(Config.LOGTAG, account.getJid().toBareJid() + ": update tiles for " + conversation.getName());
 				AvatarService.getInstance().clear(conversation);
 			}
 			if (before != mucOptions.online() || (mucOptions.online() && count != mucOptions.getUserCount())) {
@@ -94,12 +96,12 @@ public class PresenceParser extends AbstractParser implements
 						}
 						if (avatar != null) {
 							avatar.owner = from;
-							if (mXmppConnectionService.getFileBackend().isAvatarCached(avatar)) {
+							if (AvatarUtil.isAvatarCached(avatar)) {
 								if (user.setAvatar(avatar)) {
-									mXmppConnectionService.getAvatarService().clear(user);
+									AvatarService.getInstance().clear(user);
 								}
 							} else {
-								mXmppConnectionService.fetchAvatar(mucOptions.getAccount(), avatar);
+								AvatarService.getInstance().fetchAvatar(mucOptions.getAccount(), avatar);
 							}
 						}
 					}
@@ -122,7 +124,7 @@ public class PresenceParser extends AbstractParser implements
 				} else if (!from.isBareJid()){
 					MucOptions.User user = mucOptions.deleteUser(from.getResourcepart());
 					if (user != null) {
-						mXmppConnectionService.getAvatarService().clear(user);
+						AvatarService.getInstance().clear(user);
 					}
 				}
 			} else if (type.equals("error")) {