From fcb0843a1ee95ef94397235c81fcf2b3fcd859dc Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 2 Mar 2016 11:35:22 +0100
Subject: [PATCH] Fix incall video button not disabled when mediainprogress

---
 src/org/linphone/CallActivity.java | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index 1506771d1..7b837be92 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -188,15 +188,6 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
 
 				if (state == State.StreamsRunning) {
 					switchVideo(isVideoEnabled(call));
-					//Check media in progress
-					if(!call.mediaInProgress()){
-						if(LinphonePreferences.instance().isVideoEnabled()) {
-							enabledVideoButton(true);
-						}
-						enabledPauseButton(true);
-					} else {
-						enabledPauseButton(false);
-					}
 					enableAndRefreshInCallActions();
 
 					if (status != null) {
@@ -471,10 +462,10 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
 					video.setImageResource(R.drawable.camera_selected);
 					videoProgress.setVisibility(View.INVISIBLE);
 				} else {
-					video.setImageResource(R.drawable.camera_default);
+					video.setImageResource(R.drawable.camera_button);
 				}
 			} else {
-				video.setImageResource(R.drawable.camera_default);
+				video.setImageResource(R.drawable.camera_button);
 			}
 		}
 
@@ -531,11 +522,15 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
 		addCall.setEnabled(LinphoneManager.getLc().getCallsNb() < LinphoneManager.getLc().getMaxCalls() && !LinphoneManager.getLc().soundResourcesLocked());
 		options.setEnabled(!getResources().getBoolean(R.bool.disable_options_in_call) && (addCall.isEnabled() || transfer.isEnabled()));
 
-		if(LinphoneManager.getLc().getCurrentCall() != null && LinphonePreferences.instance().isVideoEnabled() && !LinphoneManager.getLc().soundResourcesLocked()) {
+		if(LinphoneManager.getLc().getCurrentCall() != null && LinphonePreferences.instance().isVideoEnabled() && !LinphoneManager.getLc().getCurrentCall().mediaInProgress()) {
 			enabledVideoButton(true);
+		} else {
+			enabledVideoButton(false);
 		}
-		if(LinphoneManager.getLc().getCurrentCall() != null && !LinphoneManager.getLc().soundResourcesLocked()){
+		if(LinphoneManager.getLc().getCurrentCall() != null && !LinphoneManager.getLc().getCurrentCall().mediaInProgress()){
 			enabledPauseButton(true);
+		} else {
+			enabledPauseButton(false);
 		}
 		micro.setEnabled(true);
 		if(!isTablet()){