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;