From 65c9dd71c7cff48cd0287ea6fd38315f19940e4e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 22 Nov 2018 13:03:13 +0100
Subject: [PATCH] prefer server side avatar on quicksy and address book avatar
 on conversations

---
 .../eu/siacs/conversations/services/AvatarService.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index dbd0f3fca..088b1a92e 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -67,12 +67,15 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
 		if (avatar != null || cachedOnly) {
 			return avatar;
 		}
-		if (contact.getAvatarFilename() != null) {
+		if (contact.getAvatarFilename() != null && QuickConversationsService.isQuicksy()) {
 			avatar = mXmppConnectionService.getFileBackend().getAvatar(contact.getAvatarFilename(), size);
 		}
 		if (avatar == null && contact.getProfilePhoto() != null) {
 			avatar = mXmppConnectionService.getFileBackend().cropCenterSquare(Uri.parse(contact.getProfilePhoto()), size);
 		}
+		if (avatar == null && contact.getAvatarFilename() != null) {
+			avatar = mXmppConnectionService.getFileBackend().getAvatar(contact.getAvatarFilename(), size);
+		}
 		if (avatar == null) {
 			avatar = get(contact.getDisplayName(), contact.getJid().asBareJid().toString(), size, false);
 		}
@@ -517,10 +520,12 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
 		Contact contact = user.getContact();
 		if (contact != null) {
 			Uri uri = null;
-			if (contact.getAvatarFilename() != null) {
+			if (contact.getAvatarFilename() != null && QuickConversationsService.isQuicksy()) {
 				uri = mXmppConnectionService.getFileBackend().getAvatarUri(contact.getAvatarFilename());
 			} else if (contact.getProfilePhoto() != null) {
 				uri = Uri.parse(contact.getProfilePhoto());
+			} else if (contact.getAvatarFilename() != null) {
+				uri = mXmppConnectionService.getFileBackend().getAvatarUri(contact.getAvatarFilename());
 			}
 			if (drawTile(canvas, uri, left, top, right, bottom)) {
 				return true;