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

Don't pause but mute when add/transfer call in conf activity.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-10-11 14:57:18 +02:00
parent a6a62a9ae5
commit e38dfaf11d
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,6 +70,7 @@ public class ConferenceActivity extends ListActivity implements
private View confHeaderView; private View confHeaderView;
static boolean active; static boolean active;
private boolean unMuteOnReturnFromUriPicker;
// Start Override to test block // Start Override to test block
protected LinphoneCore lc() { protected LinphoneCore lc() {
@ -100,11 +101,11 @@ public class ConferenceActivity extends ListActivity implements
WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS); WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
} }
private void pauseCurrentCallOrLeaveConference() { // private void pauseCurrentCallOrLeaveConference() {
LinphoneCall call = lc().getCurrentCall(); // LinphoneCall call = lc().getCurrentCall();
if (call != null) lc().pauseCall(call); // if (call != null) lc().pauseCall(call);
lc().leaveConference(); // lc().leaveConference();
} // }
private LinphoneManagerWaitHelper waitHelper; private LinphoneManagerWaitHelper waitHelper;
@Override @Override
@ -254,14 +255,21 @@ public class ConferenceActivity extends ListActivity implements
// v.setText(inConf ? R.string.in_conf : R.string.out_conf); // v.setText(inConf ? R.string.in_conf : R.string.out_conf);
} }
private void openUriPicker(String pickerType, int requestCode) {
Intent intent = new Intent().setClass(this, UriPickerActivity.class);
intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, pickerType);
startActivityForResult(intent, requestCode);
if (!lc().isMicMuted()) {
unMuteOnReturnFromUriPicker = true;
lc().muteMic(true);
((ToggleButton) findViewById(R.id.toggleMuteMic)).setChecked(true);
}
}
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()) { switch (v.getId()) {
case R.id.addCall: case R.id.addCall:
Intent intent = new Intent().setClass(this, UriPickerActivity.class); openUriPicker(UriPickerActivity.EXTRA_PICKER_TYPE_ADD, ID_ADD_CALL);
intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_ADD);
startActivityForResult(intent, ID_ADD_CALL);
pauseCurrentCallOrLeaveConference();
updateConfState();
break; break;
case R.id.conf_header: case R.id.conf_header:
View content = getLayoutInflater().inflate(R.layout.conf_choices_admin, null); View content = getLayoutInflater().inflate(R.layout.conf_choices_admin, null);
@ -397,10 +405,8 @@ public class ConferenceActivity extends ListActivity implements
prepareForTransferingExistingCall(call); prepareForTransferingExistingCall(call);
break; break;
case R.id.transfer_new: case R.id.transfer_new:
Intent intent = new Intent().setClass(ConferenceActivity.this, UriPickerActivity.class); openUriPicker(UriPickerActivity.EXTRA_PICKER_TYPE_TRANSFER, ID_TRANSFER_CALL);
intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_TRANSFER);
callToTransfer = call; callToTransfer = call;
startActivityForResult(intent, ID_TRANSFER_CALL);
break; break;
case R.id.remove_from_conference: case R.id.remove_from_conference:
lc().removeFromConference(call); lc().removeFromConference(call);
@ -673,6 +679,11 @@ public class ConferenceActivity extends ListActivity implements
private LinphoneCall callToTransfer; private LinphoneCall callToTransfer;
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (unMuteOnReturnFromUriPicker) {
lc().muteMic(false);
((ToggleButton) findViewById(R.id.toggleMuteMic)).setChecked(false);
}
if (resultCode != RESULT_OK) { if (resultCode != RESULT_OK) {
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();