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

Fix bad commit "Don't try to add empty call".

Browse source
This commit is contained in:
Guillaume Beraudo 2011-10-27 11:53:31 +02:00
parent a491ecee82
commit 9280c8ea8e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -873,7 +873,10 @@ public class ConferenceActivity extends ListActivity implements
((ToggleButton) findViewById(R.id.toggleMuteMic)).setChecked(false); ((ToggleButton) findViewById(R.id.toggleMuteMic)).setChecked(false);
} }
String uri = data.getStringExtra(UriPickerActivity.EXTRA_CALLEE_URI); String uri = null;
if (data != null) {
uri = data.getStringExtra(UriPickerActivity.EXTRA_CALLEE_URI);
}
if (resultCode != RESULT_OK || TextUtils.isEmpty(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();