Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't try to add empty call

Browse source
This commit is contained in:
Guillaume Beraudo 2011-10-27 11:32:43 +02:00
parent 27a25ce668
commit 2fe1cf4185
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/org/linphone/ConferenceActivity.java
View file

@ -873,14 +873,15 @@ public class ConferenceActivity extends ListActivity implements
((ToggleButton) findViewById(R.id.toggleMuteMic)).setChecked(false); ((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; callToTransfer = null;
Toast.makeText(this, R.string.uri_picking_canceled, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.uri_picking_canceled, Toast.LENGTH_LONG).show();
eventuallyResumeConfOrCallOnPickerReturn(true); eventuallyResumeConfOrCallOnPickerReturn(true);
return; return;
} }
String uri = data.getStringExtra(UriPickerActivity.EXTRA_CALLEE_URI);
if (!checkValidTargetUri(uri)) { if (!checkValidTargetUri(uri)) {
eventuallyResumeConfOrCallOnPickerReturn(true); eventuallyResumeConfOrCallOnPickerReturn(true);
return; return;