From e1aab3c9542f212be9f54d8cc65cb1c43293f263 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 10 Oct 2012 13:45:05 +0200
Subject: [PATCH] Updated liblinphone + fix dialer address clear

---
 src/org/linphone/DialerFragment.java           | 9 ++++++++-
 src/org/linphone/core/LinphoneCallLogImpl.java | 1 -
 submodules/linphone                            | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java
index ec0b2f2f1..914a47fed 100644
--- a/src/org/linphone/DialerFragment.java
+++ b/src/org/linphone/DialerFragment.java
@@ -47,6 +47,7 @@ public class DialerFragment extends Fragment {
 	private CallButton mCall;
 	private ImageView mAddContact;
 	private OnClickListener addContactListener, cancelListener, transferListener;
+	private boolean shouldEmptyAddressField = true;
 	
 	@Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, 
@@ -108,6 +109,7 @@ public class DialerFragment extends Fragment {
 		resetLayout(isCallTransferOngoing);
 		
 		if (getArguments() != null) {
+			shouldEmptyAddressField = false;
 			String number = getArguments().getString("SipUri");
 			String displayName = getArguments().getString("DisplayName");
 			String photo = getArguments().getString("PhotoUri");
@@ -145,7 +147,12 @@ public class DialerFragment extends Fragment {
 			LinphoneActivity.instance().selectMenu(FragmentsAvailable.DIALER);
 			LinphoneActivity.instance().updateDialerFragment(this);
 		}
-		mAddress.setText("");
+		
+		if (shouldEmptyAddressField) {
+			mAddress.setText("");
+		} else {
+			shouldEmptyAddressField = true;
+		}
 		resetLayout(isCallTransferOngoing);
 	}
 	
diff --git a/src/org/linphone/core/LinphoneCallLogImpl.java b/src/org/linphone/core/LinphoneCallLogImpl.java
index ac03d3699..05468626e 100644
--- a/src/org/linphone/core/LinphoneCallLogImpl.java
+++ b/src/org/linphone/core/LinphoneCallLogImpl.java
@@ -61,7 +61,6 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
 	public int getCallDuration() {
 		return getCallDuration(nativePtr);
 	}
-	@Override
 	public int getCallId() {
 		return getCallId(nativePtr);
 	}
diff --git a/submodules/linphone b/submodules/linphone
index 1cc0a418a..eb5ca31cf 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 1cc0a418af4718014a614afdbe6f1cd7690a4ccf
+Subproject commit eb5ca31cfd8f7dbfde549a81455376b59ba121fe