From 3bc3b24e103e87b367e6210b24f314d2675790b6 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 8 Jan 2016 17:45:50 +0100
Subject: [PATCH] Set vCard URL and eTag when new one downloaded

---
 coreapi/carddav.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/coreapi/carddav.c b/coreapi/carddav.c
index f9ea99f73..559977f04 100644
--- a/coreapi/carddav.c
+++ b/coreapi/carddav.c
@@ -90,8 +90,20 @@ static void linphone_carddav_vcards_pulled(LinphoneCardDavContext *cdc, MSList *
 			LinphoneCardDavResponse *vCard = (LinphoneCardDavResponse *)vCards->data;
 			if (vCard) {
 				LinphoneVCard *lvc = linphone_vcard_new_from_vcard4_buffer(vCard->vcard);
-				LinphoneFriend *lf = linphone_friend_new_from_vcard(lvc);
-				MSList *local_friend = ms_list_find_custom(localFriends, (int (*)(const void*, const void*))find_matching_friend, lf);
+				LinphoneFriend *lf = NULL;
+				MSList *local_friend = NULL;
+				
+				if (lvc) {
+					// Compute downloaded vCards' URL and save it (+ eTag)
+					char *vCard_name = strrchr(vCard->url, '/');
+					char full_url[300];
+					snprintf(full_url, sizeof(full_url), "%s%s", cdc->server_url, vCard_name);
+					linphone_vcard_set_url(lvc, full_url);
+					linphone_vcard_set_etag(lvc, vCard->etag);
+				}
+				lf = linphone_friend_new_from_vcard(lvc);
+				local_friend = ms_list_find_custom(localFriends, (int (*)(const void*, const void*))find_matching_friend, lf);
+				
 				if (local_friend) {
 					LinphoneFriend *lf2 = (LinphoneFriend *)local_friend->data;
 					if (cdc->contact_updated_cb) {