From 7f9558567cc3c9755211faddbc3c3201a9b0143f Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 16 Nov 2011 16:10:59 +0100
Subject: [PATCH] When picking contact without phone go to dialer anyway.

---
 .../linphone/AbstractContactPickerActivity.java    |  1 +
 src/org/linphone/LinphoneActivity.java             | 14 ++++++++++----
 src/org/linphone/UriPickerActivity.java            | 13 +++++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/org/linphone/AbstractContactPickerActivity.java b/src/org/linphone/AbstractContactPickerActivity.java
index aad1b6db2..698e40e9e 100644
--- a/src/org/linphone/AbstractContactPickerActivity.java
+++ b/src/org/linphone/AbstractContactPickerActivity.java
@@ -122,6 +122,7 @@ public abstract class AbstractContactPickerActivity extends Activity implements
 		case 0:
 			String msg = String.format(getString(R.string.no_phone_numbers), contactName);
 			Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
+			((ContactPicked) getParent()).goToDialer();
 			break;
 		case 1:
 			returnSelectedValues(phones.get(0), contactName.toString(), getPhotoUri(id));
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index d51b1fafa..4fb07d39c 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -192,7 +192,7 @@ public class LinphoneActivity extends TabActivity implements
 	    		R.string.tab_contact, R.drawable.contact_orange);
 
 
-	    gotToDialer();
+	    selectDialerTab();
 	}
 
 	@Override
@@ -202,7 +202,7 @@ public class LinphoneActivity extends TabActivity implements
 			Log.i("LinphoneActivity received an intent without data, recreating GUI if needed");
 			if (!LinphoneManager.getLc().isIncall()) return;
 			if(LinphoneManager.getLc().isInComingInvitePending()) {
-				gotToDialer();
+				selectDialerTab();
 			} else {
 				startIncallActivity();
 			}
@@ -413,10 +413,10 @@ public class LinphoneActivity extends TabActivity implements
 
 	public void setAddressAndGoToDialer(String number, String name, Uri photo) {
 		DialerActivity.instance().setContactAddress(number, name, photo);
-		instance.gotToDialer();
+		selectDialerTab();
 	}
 
-	private void gotToDialer() {
+	private void selectDialerTab() {
 		getTabHost().setCurrentTabByTag(DIALER_TAB);
 	}
 
@@ -585,8 +585,14 @@ public class LinphoneActivity extends TabActivity implements
 			// removing is done directly in LinphoneActivity.onPause()
 		}
 	}
+
+	@Override
+	public void goToDialer() {
+		selectDialerTab();
+	}
 }
 
 interface ContactPicked {
 	void setAddressAndGoToDialer(String number, String name, Uri photo);
+	void goToDialer();
 }
diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java
index 19093364e..f39e09d59 100644
--- a/src/org/linphone/UriPickerActivity.java
+++ b/src/org/linphone/UriPickerActivity.java
@@ -74,11 +74,11 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
 						R.string.tab_contact, R.drawable.contact_orange);
 
 
-		gotToDialer();
+		selectDialerTab();
 	}
 
 
-	private void gotToDialer() {
+	private void selectDialerTab() {
 		getTabHost().setCurrentTabByTag(DIALER_TAB);
 	}
 
@@ -158,7 +158,12 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
 	public void setAddressAndGoToDialer(String number, String name, Uri photo) {
 		DialerActivity dialer = (DialerActivity) getLocalActivityManager().getActivity(DIALER_TAB);
 		dialer.setContactAddress(number, name, photo);
-		gotToDialer();
+		selectDialerTab();
+	}
+
+
+	@Override
+	public void goToDialer() {
+		selectDialerTab();
 	}
-	
 }