From 378b0948afbce03466cfc94e20f2c7e24cfc3112 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Wed, 29 Feb 2012 12:42:06 +0100
Subject: [PATCH] Doesn't longer enable camera when launching VideoCallActivity
 if in NoWebcam mode

---
 src/org/linphone/IncallActivity.java   | 18 +++++++++++++-----
 src/org/linphone/LinphoneActivity.java |  3 +--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java
index 0f7738f8b..057a7dcd4 100644
--- a/src/org/linphone/IncallActivity.java
+++ b/src/org/linphone/IncallActivity.java
@@ -31,10 +31,10 @@ import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener;
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallEncryptionChangedListener;
 import org.linphone.core.LinphoneAddress;
 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.LinphoneCore.MediaEncryption;
+import org.linphone.core.LinphoneCoreException;
+import org.linphone.core.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.ui.Numpad;
 
@@ -48,9 +48,9 @@ import android.os.Handler;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
+import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Checkable;
 import android.widget.ImageView;
@@ -298,7 +298,11 @@ public class IncallActivity extends AbstractCalleesActivity implements
 		case R.id.conf_simple_video:
 			LinphoneCall vCall = lc().getCurrentCall();
 			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);
 				}
 			}
@@ -370,7 +374,11 @@ public class IncallActivity extends AbstractCalleesActivity implements
 				mCallToTransfer = call;	
 				break;
 			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);
 				}
 				break;
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index f807cd420..08a78a25b 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -385,12 +385,11 @@ public class LinphoneActivity extends TabActivity implements ContactPicked
 		if (VideoCallActivity.launched || call == null) {
 			return;
 		}
-
 		mHandler.postDelayed(new Runnable() {
 			public void run() {
 				if (VideoCallActivity.launched) return;
 				startOrientationSensor();
-				LinphoneManager.getInstance().enableCamera(call, true);
+				//LinphoneManager.getInstance().enableCamera(call, true);
 				startActivityForResult(new Intent().setClass(
 						LinphoneActivity.this,
 						VideoCallActivity.class),