From 0cce11b866f05864427e7d9767f59654cb9e9ea0 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Mon, 15 Apr 2013 10:54:05 +0200
Subject: [PATCH] Use contact name for incall view if available

---
 src/org/linphone/InCallActivity.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java
index c03ea1d24..975cd5f50 100644
--- a/src/org/linphone/InCallActivity.java
+++ b/src/org/linphone/InCallActivity.java
@@ -1304,14 +1304,18 @@ public class InCallActivity extends FragmentActivity implements
 	
 	private void setContactName(LinearLayout callView, LinphoneAddress lAddress, String sipUri, Resources resources) {
 		TextView contact = (TextView) callView.findViewById(R.id.contactNameOrNumber);
-		if (lAddress.getDisplayName() == null) {
+		
+		LinphoneUtils.findUriPictureOfContactAndSetDisplayName(lAddress, callView.getContext().getContentResolver());
+		String displayName = lAddress.getDisplayName();
+
+		if (displayName == null) {
 	        if (resources.getBoolean(R.bool.only_display_username_if_unknown) && LinphoneUtils.isSipAddress(sipUri)) {
 	        	contact.setText(LinphoneUtils.getUsernameFromAddress(sipUri));
 			} else {
 				contact.setText(sipUri);
 			}
 		} else {
-			contact.setText(lAddress.getDisplayName());
+			contact.setText(displayName);
 		}
 	}