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

Fix incall video button not disabled when mediainprogress

Browse source
This commit is contained in:
Margaux Clerc 2016-03-02 11:35:22 +01:00
parent 06a01083dd
commit fcb0843a1e
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/org/linphone/CallActivity.java
View file

@ -188,15 +188,6 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
if (state == State.StreamsRunning) { if (state == State.StreamsRunning) {
switchVideo(isVideoEnabled(call)); switchVideo(isVideoEnabled(call));
//Check media in progress
if(!call.mediaInProgress()){
if(LinphonePreferences.instance().isVideoEnabled()) {
enabledVideoButton(true);
}
enabledPauseButton(true);
} else {
enabledPauseButton(false);
}
enableAndRefreshInCallActions(); enableAndRefreshInCallActions();
if (status != null) { if (status != null) {
@ -471,10 +462,10 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
video.setImageResource(R.drawable.camera_selected); video.setImageResource(R.drawable.camera_selected);
videoProgress.setVisibility(View.INVISIBLE); videoProgress.setVisibility(View.INVISIBLE);
} else { } else {
video.setImageResource(R.drawable.camera_default); video.setImageResource(R.drawable.camera_button);
} }
} else { } 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()); 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())); 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); enabledVideoButton(true);
} else {
enabledVideoButton(false);
} }
if(LinphoneManager.getLc().getCurrentCall() != null && !LinphoneManager.getLc().soundResourcesLocked()){ if(LinphoneManager.getLc().getCurrentCall() != null && !LinphoneManager.getLc().getCurrentCall().mediaInProgress()){
enabledPauseButton(true); enabledPauseButton(true);
} else {
enabledPauseButton(false);
} }
micro.setEnabled(true); micro.setEnabled(true);
if(!isTablet()){ if(!isTablet()){