From 36240ca61216753aac27972de1243a5d54f3bd91 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 2 Sep 2014 14:30:12 +0200
Subject: [PATCH] Fix add contact from dialer or history

---
 src/org/linphone/EditContactFragment.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/org/linphone/EditContactFragment.java b/src/org/linphone/EditContactFragment.java
index f46c43f72..4f46e980a 100644
--- a/src/org/linphone/EditContactFragment.java
+++ b/src/org/linphone/EditContactFragment.java
@@ -58,6 +58,7 @@ public class EditContactFragment extends Fragment {
 			}
 			if (getArguments().getString("NewSipAdress") != null) {
 				newSipOrNumberToAdd = getArguments().getString("NewSipAdress");
+				isNewContact = true;
 			}
 		}
 		
@@ -263,7 +264,11 @@ public class EditContactFragment extends Fragment {
 		if (forceAddNumber) {
 			tempNounoa = new NewOrUpdatedNumberOrAddress(isSip);
 		} else {
-			tempNounoa = new NewOrUpdatedNumberOrAddress(numberOrAddress, isSip);
+			if(isNewContact) {
+				tempNounoa = new NewOrUpdatedNumberOrAddress(isSip, numberOrAddress);
+			} else {
+				tempNounoa = new NewOrUpdatedNumberOrAddress(numberOrAddress, isSip);
+			}
 		}
 		final NewOrUpdatedNumberOrAddress nounoa = tempNounoa;
 		numbersAndAddresses.add(nounoa);
@@ -499,6 +504,12 @@ public class EditContactFragment extends Fragment {
 			isSipAddress = isSip;
 		}
 		
+		public NewOrUpdatedNumberOrAddress(boolean isSip, String newSip) {
+			oldNumberOrAddress = null;
+			newNumberOrAddress = newSip;
+			isSipAddress = isSip;
+		}
+		
 		public void setNewNumberOrAddress(String newN) {
 			newNumberOrAddress = newN;
 		}