From 4ff4d53e762f8a6db55aa3e580c70678f813ffa6 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 21 Jul 2016 17:16:02 +0200
Subject: [PATCH] Use vCard given/familly names + improved/fixed
 LinphoneFriends update/creation

---
 src/org/linphone/LinphoneContact.java | 150 ++++++++++++--------------
 submodules/linphone                   |   2 +-
 2 files changed, 70 insertions(+), 82 deletions(-)

diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index dddec55f6..ff7cb8faa 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -351,6 +351,69 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		return androidId;
 	}
 	
+	private void createOrUpdateFriend() {
+		if (!isLinphoneFriend()) {
+			friend = LinphoneCoreFactory.instance().createLinphoneFriend();
+			friend.enableSubscribes(false);
+			friend.setIncSubscribePolicy(SubscribePolicy.SPDeny);
+			if (isAndroidContact()) {
+				friend.setRefKey(getAndroidId());
+			}
+		}
+		if (isLinphoneFriend()) {
+			updateFriend();
+		}
+	}
+	
+	private void updateFriend() {
+		if (!isLinphoneFriend()) return;
+		
+		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
+		if (lc == null) return;
+		
+		friend.edit();
+		friend.setFamillyName(lastName);
+		friend.setGivenName(firstName);
+		
+		for (LinphoneAddress address : friend.getAddresses()) {
+			friend.removeAddress(address);
+		}
+		for (String phone : friend.getPhoneNumbers()) {
+			friend.removePhoneNumber(phone);
+		}
+		for (LinphoneNumberOrAddress noa : addresses) {
+			if (noa.isSIPAddress()) {
+				try {
+					LinphoneAddress addr = lc.interpretUrl(noa.getValue());
+					if (addr != null) {
+						friend.addAddress(addr);
+					}
+				} catch (LinphoneCoreException e) {
+					Log.e(e);
+				}
+			} else {
+				friend.addPhoneNumber(noa.getValue());
+			}
+		}
+		friend.setName(fullName);
+		friend.done();
+		
+		if (friend.getAddress() != null) {
+			if (lc.findFriendByAddress(friend.getAddress().asString()) == null) {
+				try {
+					lc.addFriend(friend);
+					if (!ContactsManager.getInstance().hasContactsAccess()) {
+						// This refresh is only needed if app has no contacts permission to refresh the list of LinphoneFriends. 
+						// Otherwise contacts will be refreshed due to changes in native contact and the handler in ContactsManager
+						ContactsManager.getInstance().fetchContactsAsync();
+					}
+				} catch (LinphoneCoreException e) {
+					Log.e(e);
+				}
+			}
+		}
+	}
+	
 	public void save() {		
 		if (isAndroidContact() && ContactsManager.getInstance().hasContactsAccess() && changesToCommit.size() > 0) {		
 			try {
@@ -364,53 +427,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 			}
 		}
 		
-		if (isLinphoneFriend()) {
-			boolean hasAddr = false;
-			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-			if (lc == null) return;
-			
-			friend.edit();
-			for (LinphoneAddress address : friend.getAddresses()) {
-				friend.removeAddress(address);
-			}
-			for (String phone : friend.getPhoneNumbers()) {
-				friend.removePhoneNumber(phone);
-			}
-			for (LinphoneNumberOrAddress noa : addresses) {
-				if (noa.isSIPAddress()) {
-					try {
-						LinphoneAddress addr = lc.interpretUrl(noa.getValue());
-						if (addr != null) {
-							friend.addAddress(addr);
-							hasAddr = true;
-						}
-					} catch (LinphoneCoreException e) {
-						Log.e(e);
-					}
-				} else {
-					friend.addPhoneNumber(noa.getValue());
-				}
-			}
-			if (hasAddr) {
-				friend.setName(fullName);
-			}
-			friend.done();
-			
-			if (friend.getAddress() != null) {
-				if (lc.findFriendByAddress(friend.getAddress().asString()) == null) {
-					try {
-						lc.addFriend(friend);
-						if (!ContactsManager.getInstance().hasContactsAccess()) {
-							// This refresh is only needed if app has no contacts permission to refresh the list of LinphoneFriends. 
-							// Otherwise contacts will be refreshed due to changes in native contact and the handler in ContactsManager
-							ContactsManager.getInstance().fetchContactsAsync();
-						}
-					} catch (LinphoneCoreException e) {
-						Log.e(e);
-					}
-				}
-			}
-		}
+		createOrUpdateFriend();
 	}
 
 	public void delete() {
@@ -449,46 +466,17 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 				addNumberOrAddress(noa);
 			}
 			
-			if (friend == null) {
-				friend = LinphoneCoreFactory.instance().createLinphoneFriend();
-				friend.setRefKey(getAndroidId());
-				// Disable subscribes for now
-				friend.enableSubscribes(false);
-				friend.setIncSubscribePolicy(SubscribePolicy.SPDeny);
-				if (hasSipAddress) {
-					for (LinphoneNumberOrAddress noa : addresses) {
-						if (noa.isSIPAddress()) {
-							try {
-								LinphoneAddress addr = LinphoneManager.getLc().interpretUrl(noa.getValue());
-								if (addr != null) {
-									friend.addAddress(addr);
-								}
-							} catch (LinphoneCoreException e) {
-								Log.e(e);
-							}
-						} else {
-							friend.addPhoneNumber(noa.getValue());
-						}
-					}
-				}
-				LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-				if (lc != null && friend.getAddress() != null) {
-					friend.setName(fullName);
-					try {
-						lc.addFriend(friend);
-					} catch (LinphoneCoreException e) {
-						Log.e(e);
-					}
-				}
-			}
+			createOrUpdateFriend();
 		} else if (isLinphoneFriend()) {
 			fullName = friend.getName();
+			lastName = friend.getFamillyName();
+			firstName = friend.getGivenName();
 			thumbnailUri = null;
 			photoUri = null;
+			
 			LinphoneAddress addr = friend.getAddress();
 			if (addr != null) {
-				addresses.add(new LinphoneNumberOrAddress(addr.asStringUriOnly(), true));
-				hasSipAddress = true;
+				addNumberOrAddress(new LinphoneNumberOrAddress(addr.asStringUriOnly(), true));
 			}
 		}
 	}
diff --git a/submodules/linphone b/submodules/linphone
index a5008f43b..442cd8b9d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit a5008f43bf329434be939b60a744d60a33787e66
+Subproject commit 442cd8b9db8dc29aab1c5e9952bab389dd8d478c