From 2fe1cf41852a31c1fed737635a1d7380949a1b3b Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Thu, 27 Oct 2011 11:32:43 +0200
Subject: [PATCH] Don't try to add empty call

---
 src/org/linphone/ConferenceActivity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index ac236b427..406e821af 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -873,14 +873,15 @@ public class ConferenceActivity extends ListActivity implements
 			((ToggleButton) findViewById(R.id.toggleMuteMic)).setChecked(false);
 		}
 
-		if (resultCode != RESULT_OK) {
+		String uri = data.getStringExtra(UriPickerActivity.EXTRA_CALLEE_URI);
+		if (resultCode != RESULT_OK || TextUtils.isEmpty(uri)) {
 			callToTransfer = null;
 			Toast.makeText(this, R.string.uri_picking_canceled, Toast.LENGTH_LONG).show();
 			eventuallyResumeConfOrCallOnPickerReturn(true);
 			return;
 		}
 
-		String uri = data.getStringExtra(UriPickerActivity.EXTRA_CALLEE_URI);
+
 		if (!checkValidTargetUri(uri)) {
 			eventuallyResumeConfOrCallOnPickerReturn(true);
 			return;