From b01e60aaeda23ec7ababf7077848e678592c68f1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 13 Oct 2016 12:43:41 +0200
Subject: [PATCH] Improvements & fixes related to phone numbers

---
 src/org/linphone/ContactDetailsFragment.java | 38 +++++++++-----------
 src/org/linphone/LinphoneContact.java        |  3 ++
 src/org/linphone/LinphoneManager.java        | 10 ++++--
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java
index e9488576a..8c806d0c1 100644
--- a/src/org/linphone/ContactDetailsFragment.java
+++ b/src/org/linphone/ContactDetailsFragment.java
@@ -118,8 +118,9 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 		for (LinphoneNumberOrAddress noa : contact.getNumbersOrAddresses()) {
 			boolean skip = false;
 			View v = inflater.inflate(R.layout.contact_control_row, null);
-			
-			String displayednumberOrAddress = LinphoneUtils.getDisplayableUsernameFromAddress(noa.getValue());
+
+			String value = noa.getValue();
+			String displayednumberOrAddress = LinphoneUtils.getDisplayableUsernameFromAddress(value);
 
 			TextView label = (TextView) v.findViewById(R.id.address_label);
 			if (noa.isSIPAddress()) {
@@ -133,40 +134,35 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 			TextView tv = (TextView) v.findViewById(R.id.numeroOrAddress);
 			tv.setText(displayednumberOrAddress);
 			tv.setSelected(true);
+			
+
+			LinphoneProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig();
+			if (lpc != null) {
+				String username = lpc.normalizePhoneNumber(displayednumberOrAddress);
+				value = LinphoneUtils.getFullAddressFromUsername(username);
+			}
 
 			String contactAddress = contact.getPresenceModelForUri(noa.getValue());
-			if(contactAddress != null) {
+			if (contactAddress != null) {
 				v.findViewById(R.id.friendLinphone).setVisibility(View.VISIBLE);
 			}
 			
 			if (!displayChatAddressOnly) {
 				v.findViewById(R.id.contact_call).setOnClickListener(dialListener);
-				if(contactAddress != null){
-					v.findViewById(R.id.contact_call).setTag(contact.getPresenceModelForUri(noa.getValue()));
+				if (contactAddress != null) {
+					v.findViewById(R.id.contact_call).setTag(contactAddress);
 				} else {
-					v.findViewById(R.id.contact_call).setTag(displayednumberOrAddress);
+					v.findViewById(R.id.contact_call).setTag(value);
 				}
 			} else {
 				v.findViewById(R.id.contact_call).setVisibility(View.GONE);
 			}
 
 			v.findViewById(R.id.contact_chat).setOnClickListener(chatListener);
-			LinphoneProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig();
-			if (lpc != null) {
-				String username = lpc.normalizePhoneNumber(LinphoneUtils.getUsernameFromAddress(noa.getValue()));
-				String tag = LinphoneUtils.getFullAddressFromUsername(username);
-
-				if(contactAddress != null){
-					v.findViewById(R.id.contact_chat).setTag(contact.getPresenceModelForUri(noa.getValue()));
-				} else {
-					v.findViewById(R.id.contact_chat).setTag(tag);
-				}
+			if (contactAddress != null) {
+				v.findViewById(R.id.contact_chat).setTag(contactAddress);
 			} else {
-				if(contactAddress != null){
-					v.findViewById(R.id.contact_chat).setTag(contact.getPresenceModelForUri(noa.getValue()));
-				} else {
-					v.findViewById(R.id.contact_chat).setTag(noa.getValue());
-				}
+				v.findViewById(R.id.contact_chat).setTag(value);
 			}
 			
 			if (getResources().getBoolean(R.bool.disable_chat)) {
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 31c5284d3..a2eb78bc3 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -743,6 +743,9 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 							if (isSIP && !number.startsWith("sip:")) {
 								number = "sip:" + number;
 							}
+							if (isSIP && !number.contains("@")) {
+								number = number + "@" + ContactsManager.getInstance().getString(R.string.default_domain);
+							}
 							result.add(new LinphoneNumberOrAddress(number, isSIP));
 						}
 					}
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 8fbe74c09..50b1467f2 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -471,15 +471,19 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 //			return;
 //		}
 		
+		LinphoneProxyConfig lpc = getLc().getDefaultProxyConfig();
+		if (lpc != null) {
+			to = lpc.normalizePhoneNumber(to);
+		}
+		
 		LinphoneAddress lAddress;
 		try {
 			lAddress = mLc.interpretUrl(to);
-			LinphoneProxyConfig lpc = mLc.getDefaultProxyConfig();
-
-			if (mR.getBoolean(R.bool.forbid_self_call) && lpc!=null && lAddress.asStringUriOnly().equals(lpc.getIdentity())) {
+			if (mR.getBoolean(R.bool.forbid_self_call) && lpc != null && lAddress.asStringUriOnly().equals(lpc.getIdentity())) {
 				return;
 			}
 		} catch (LinphoneCoreException e) {
+			Log.e(e);
 			return;
 		}
 		lAddress.setDisplayName(displayName);