From 6f3059444fd88fcbfdab7736ffb1fe6cfbf889bb Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 17 Jan 2017 17:36:05 +0100
Subject: [PATCH] More performances improvements for contacts

---
 src/org/linphone/ContactsManager.java | 15 +++++++++++----
 src/org/linphone/LinphoneContact.java |  6 +++---
 src/org/linphone/LinphoneUtils.java   |  1 -
 submodules/belcard                    |  2 +-
 submodules/linphone                   |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index b1681d72f..8b4e6d878 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -328,6 +328,13 @@ public class ContactsManager extends ContentObserver {
 			} else {
 				Log.w("[Permission] Read contacts permission wasn't granted, only fetch LinphoneFriends");
 			}
+			long timeElapsed = (new Date()).getTime() - contactsTime.getTime();
+			String time = String.format("%02d:%02d",
+				    TimeUnit.MILLISECONDS.toMinutes(timeElapsed),
+				    TimeUnit.MILLISECONDS.toSeconds(timeElapsed) -
+				    TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(timeElapsed)));
+			Log.i("[ContactsManager] got " + contacts.size() + " contacts names and pictures in " + time);
+			
 			//We need to check sometimes to know if Linphone was destroyed
 			if (this.isCancelled()) {
 				return null;
@@ -387,12 +394,12 @@ public class ContactsManager extends ContentObserver {
 			}
 			Collections.sort(contacts);
 
-			long timeElapsed = (new Date()).getTime() - contactsTime.getTime();
-			String time = String.format("%02d:%02d",
+			timeElapsed = (new Date()).getTime() - contactsTime.getTime();
+			time = String.format("%02d:%02d",
 				    TimeUnit.MILLISECONDS.toMinutes(timeElapsed),
 				    TimeUnit.MILLISECONDS.toSeconds(timeElapsed) -
 				    TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(timeElapsed)));
-			Log.i("[ContactsManager] minimal informations for " + contacts.size() + " contacts gathered in " + time);
+			Log.i("[ContactsManager] organization, SIP and phone numbers for " + contacts.size() + " contacts fetched in " + time);
 			// Public the current list of contacts without all the informations populated
 			publishProgress(contacts);
 
@@ -409,7 +416,7 @@ public class ContactsManager extends ContentObserver {
 				    TimeUnit.MILLISECONDS.toMinutes(timeElapsed),
 				    TimeUnit.MILLISECONDS.toSeconds(timeElapsed) -
 				    TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(timeElapsed)));
-			Log.i("[ContactsManager] complete informations for " + contacts.size() + " contacts gathered in " + time);
+			Log.i("[ContactsManager] linphone friends for " + contacts.size() + " contacts created in " + time);
 
 			return contacts;
 		}
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 52d34c8c6..f1ff5bfe6 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -392,6 +392,8 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 
 	public void setAndroidId(String id) {
 		androidId = id;
+		setThumbnailUri(getContactThumbnailPictureUri());
+		setPhotoUri(getContactPictureUri());
 	}
 
 	public String getAndroidId() {
@@ -419,9 +421,9 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		if (lc == null) return;
 
 		friend.edit();
+		friend.setName(fullName);
 		friend.setFamilyName(lastName);
 		friend.setGivenName(firstName);
-		friend.setName(fullName);
 
 		for (LinphoneAddress address : friend.getAddresses()) {
 			friend.removeAddress(address);
@@ -504,8 +506,6 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		if (isAndroidContact()) {
 			getContactNames();
 			getNativeContactOrganization();
-			setThumbnailUri(getContactThumbnailPictureUri());
-			setPhotoUri(getContactPictureUri());
 
 			for (LinphoneNumberOrAddress noa : getAddressesAndNumbersForAndroidContact()) {
 				addNumberOrAddress(noa);
diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index a04ac4a8d..65e490a2a 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -269,7 +269,6 @@ public final class LinphoneUtils {
 			try {
 				bm = MediaStore.Images.Media.getBitmap(c.getContentResolver(),tUri);
 			} catch (IOException e) {
-				Log.e(e.getMessage());
 			}
 			if (bm != null) {
 				view.setImageBitmap(bm);
diff --git a/submodules/belcard b/submodules/belcard
index f5a8603f8..ebd037585 160000
--- a/submodules/belcard
+++ b/submodules/belcard
@@ -1 +1 @@
-Subproject commit f5a8603f8e379486d3a4bfa4d74861b0a2d880dd
+Subproject commit ebd037585965ce80f01be5290abc7e5455009eb8
diff --git a/submodules/linphone b/submodules/linphone
index 289d4bb36..c5bce292d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 289d4bb36501671f7cc96cafa134e019faf3d108
+Subproject commit c5bce292df15812c68cc2c0487b836e28d76250c