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

Enable back the remove from conference.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-12-01 16:40:21 +01:00
parent 740df0d5f4
commit 46a1b918a8
1 changed files with 40 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/org/linphone/ConferenceDetailsActivity.java
View file

@ -24,9 +24,12 @@ import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneCall;
import org.linphone.mediastream.Version;
import android.app.AlertDialog;
import android.app.Dialog;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.TextView;
@ -72,19 +75,19 @@ public class ConferenceDetailsActivity extends AbstractCalleesActivity {
((TextView) v.findViewById(R.id.name)).setText(mainText);
((TextView) v.findViewById(R.id.address)).setText("");
// v.setOnClickListener(new OnClickListener() {
// public void onClick(View v) {
// if (lc().soundResourcesLocked()) {
// return;
// }
// View content = getLayoutInflater().inflate(R.layout.conf_details_participant_choices_dialog, null);
// Dialog dialog = new AlertDialog.Builder(ConferenceDetailsActivity.this).setView(content).create();
// OnClickListener l = new CallActionListener(call, dialog);
// enableView(content, R.id.remove_from_conference, l, true);
// enableView(content, R.id.terminate_call, l, true);
// dialog.show();
// }
// });
v.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
if (lc().soundResourcesLocked()) {
return;
}
View content = getLayoutInflater().inflate(R.layout.conf_details_participant_choices_dialog, null);
Dialog dialog = new AlertDialog.Builder(ConferenceDetailsActivity.this).setView(content).create();
OnClickListener l = new CallActionListener(call, dialog);
enableView(content, R.id.remove_from_conference, l, true);
enableView(content, R.id.terminate_call, l, true);
dialog.show();
}
});
// May be greatly sped up using a drawable cache
ImageView pictureView = (ImageView) v.findViewById(R.id.picture);
@ -96,30 +99,30 @@ public class ConferenceDetailsActivity extends AbstractCalleesActivity {
}
// private class CallActionListener implements OnClickListener {
// private LinphoneCall call;
// private Dialog dialog;
// public CallActionListener(LinphoneCall call, Dialog dialog) {
// this.call = call;
// this.dialog = dialog;
// }
// public void onClick(View v) {
// switch (v.getId()) {
// case R.id.terminate_call:
// lc().terminateCall(call);
// break;
// case R.id.remove_from_conference:
// lc().removeFromConference(call);
// if (LinphoneUtils.countConferenceCalls(lc()) == 0) {
// finish();
// }
// break;
// default:
// throw new RuntimeException("unknown id " + v.getId());
// }
// if (dialog != null) dialog.dismiss();
// }
// }
private class CallActionListener implements OnClickListener {
private LinphoneCall call;
private Dialog dialog;
public CallActionListener(LinphoneCall call, Dialog dialog) {
this.call = call;
this.dialog = dialog;
}
public void onClick(View v) {
switch (v.getId()) {
case R.id.terminate_call:
lc().terminateCall(call);
break;
case R.id.remove_from_conference:
lc().removeFromConference(call);
if (LinphoneUtils.countConferenceCalls(lc()) == 0) {
finish();
}
break;
default:
throw new RuntimeException("unknown id " + v.getId());
}
if (dialog != null) dialog.dismiss();
}
}
@Override