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

Doesn't longer enable camera when launching VideoCallActivity if in NoWebcam mode

Browse source
This commit is contained in:
Sylvain Berfini 2012-02-29 12:42:06 +01:00
parent 8cde57596d
commit 378b0948af
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/org/linphone/IncallActivity.java
View file

@ -31,10 +31,10 @@ import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener;
import org.linphone.LinphoneSimpleListener.LinphoneOnCallEncryptionChangedListener; import org.linphone.LinphoneSimpleListener.LinphoneOnCallEncryptionChangedListener;
import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCall;
import org.linphone.core.LinphoneCoreException;
import org.linphone.core.Log;
import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCall.State;
import org.linphone.core.LinphoneCore.MediaEncryption; import org.linphone.core.LinphoneCore.MediaEncryption;
import org.linphone.core.LinphoneCoreException;
import org.linphone.core.Log;
import org.linphone.mediastream.Version; import org.linphone.mediastream.Version;
import org.linphone.ui.Numpad; import org.linphone.ui.Numpad;
@ -48,9 +48,9 @@ import android.os.Handler;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener; import android.view.View.OnLongClickListener;
import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Checkable; import android.widget.Checkable;
import android.widget.ImageView; import android.widget.ImageView;
@ -298,7 +298,11 @@ public class IncallActivity extends AbstractCalleesActivity implements
case R.id.conf_simple_video: case R.id.conf_simple_video:
LinphoneCall vCall = lc().getCurrentCall(); LinphoneCall vCall = lc().getCurrentCall();
if (vCall != null) { if (vCall != null) {
if (!LinphoneManager.getInstance().addVideo()) { if (!vCall.cameraEnabled() && vCall.getCurrentParamsCopy().getVideoEnabled()) {
// NoWebcam mode, we let it this way
LinphoneActivity.instance().startVideoActivity(vCall, 0);
}
else if (!LinphoneManager.getInstance().addVideo()) {
LinphoneActivity.instance().startVideoActivity(vCall, 0); LinphoneActivity.instance().startVideoActivity(vCall, 0);
} }
} }
@ -370,7 +374,11 @@ public class IncallActivity extends AbstractCalleesActivity implements
mCallToTransfer = call; mCallToTransfer = call;
break; break;
case R.id.addVideo: case R.id.addVideo:
if (!LinphoneManager.getInstance().addVideo()) { if (!call.cameraEnabled() && call.getCurrentParamsCopy().getVideoEnabled()) {
// NoWebcam mode, we let it this way
LinphoneActivity.instance().startVideoActivity(call, 0);
}
else if (!LinphoneManager.getInstance().addVideo()) {
LinphoneActivity.instance().startVideoActivity(call, 0); LinphoneActivity.instance().startVideoActivity(call, 0);
} }
break; break;

3
src/org/linphone/LinphoneActivity.java
View file

@ -385,12 +385,11 @@ public class LinphoneActivity extends TabActivity implements ContactPicked
if (VideoCallActivity.launched || call == null) { if (VideoCallActivity.launched || call == null) {
return; return;
} }
mHandler.postDelayed(new Runnable() { mHandler.postDelayed(new Runnable() {
public void run() { public void run() {
if (VideoCallActivity.launched) return; if (VideoCallActivity.launched) return;
startOrientationSensor(); startOrientationSensor();
LinphoneManager.getInstance().enableCamera(call, true); //LinphoneManager.getInstance().enableCamera(call, true);
startActivityForResult(new Intent().setClass( startActivityForResult(new Intent().setClass(
LinphoneActivity.this, LinphoneActivity.this,
VideoCallActivity.class), VideoCallActivity.class),