From 5b21689a447b21c131ca544ed235f592ab2841ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 27 Mar 2019 12:52:39 +0100
Subject: [PATCH] Use dav hasPhoto to properly load photos into the list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 package-lock.json                                | 2 +-
 src/components/ContactsList/ContactsListItem.vue | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5401247cc..3121ddbed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2257,7 +2257,7 @@
       "dev": true
     },
     "cdav-library": {
-      "version": "github:nextcloud/cdav-library#3ec4dae028f086fed3e1baa49ec6f6dd04c95043",
+      "version": "github:nextcloud/cdav-library#e8f29188a90b1ef346882ac0c1b2c39f0cf42f84",
       "from": "github:nextcloud/cdav-library",
       "requires": {
         "@babel/polyfill": "^7.4.0"
diff --git a/src/components/ContactsList/ContactsListItem.vue b/src/components/ContactsList/ContactsListItem.vue
index 60086c4ac..9dca4d448 100644
--- a/src/components/ContactsList/ContactsListItem.vue
+++ b/src/components/ContactsList/ContactsListItem.vue
@@ -11,7 +11,7 @@
 		<div :style="{ 'backgroundColor': colorAvatar }" class="app-content-list-item-icon">
 			{{ contact.displayName | firstLetter }}
 			<!-- try to fetch the avatar only if the contact exists on the server -->
-			<div v-if="contact.photo && contact.dav" :style="{ 'backgroundImage': avatarUrl }" class="app-content-list-item-icon__avatar" />
+			<div v-if="hasPhoto" :style="{ 'backgroundImage': avatarUrl }" class="app-content-list-item-icon__avatar" />
 		</div>
 		<div class="app-content-list-item-line-one">
 			{{ contact.displayName }}
@@ -59,6 +59,10 @@ export default {
 			return window.btoa(this.contact.key).slice(0, -2)
 		},
 
+		hasPhoto() {
+			return this.contact.dav && (this.contact.dav.hasphoto || this.contact.photo)
+		},
+
 		/**
 		 * Is this matching the current search ?
 		 *