From fbac8c01cd62acd5825182b0a281ed21a6bc91e1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 21 Jul 2016 12:13:13 +0200
Subject: [PATCH] Fixed display issue in contacts' search list in chatfragment

---
 src/org/linphone/ChatFragment.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index cb155352f..68508392c 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -1026,7 +1026,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		if(search != null) {
 			for (ContactAddress c : searchAdapter.contacts) {
 				String address = c.address;
-				if(address.startsWith("sip:")) address = address.substring(4);
+				if (address.startsWith("sip:")) address = address.substring(4);
 				if (c.contact.getFullName().toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault())) 
 						|| address.toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault()))) {
 					result.add(c);
@@ -1044,7 +1044,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 
 		SearchContactsListAdapter(List<ContactAddress> contactsList) {
 			mInflater = inflater;
-			if(contactsList == null){
+			if (contactsList == null) {
 				contacts = getContactsList();
 			} else {
 				contacts = contactsList;
@@ -1056,7 +1056,13 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			if(ContactsManager.getInstance().hasContacts()) {
 				for (LinphoneContact con : ContactsManager.getInstance().getContacts()) {
 					for (LinphoneNumberOrAddress noa : con.getNumbersOrAddresses()) {
-						list.add(new ContactAddress(con, noa.getValue()));
+						String value = noa.getValue();
+						// Fix for sip:username compatibility issue
+						if (value.startsWith("sip:") && !value.contains("@")) {
+							value = value.substring(4);
+							value = LinphoneUtils.getFullAddressFromUsername(value);
+						}
+						list.add(new ContactAddress(con, value));
 					}
 				}
 			}
@@ -1094,7 +1100,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			}
 
 			final String a = contact.address;
-			final LinphoneContact c = contact.contact;
+			LinphoneContact c = contact.contact;
 
 			TextView name = (TextView) view.findViewById(R.id.contact_name);
 			name.setText(c.getFullName());