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

Activate video button when mediaInProgress is false

Browse source
This commit is contained in:
Margaux Clerc 2015-02-17 16:50:24 +01:00
parent 37e7002f6f
commit 99a5d7714e
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/org/linphone/InCallActivity.java
View file

@ -131,10 +131,6 @@ public class InCallActivity extends FragmentActivity implements OnClickListener
return; return;
} }
if(!LinphonePreferences.instance().isVideoEnabled()){
video.setEnabled(true);
}
if (state == State.IncomingReceived) { if (state == State.IncomingReceived) {
startIncomingCallActivity(); startIncomingCallActivity();
return; return;
@ -159,6 +155,11 @@ public class InCallActivity extends FragmentActivity implements OnClickListener
if (state == State.StreamsRunning) { if (state == State.StreamsRunning) {
switchVideo(isVideoEnabled(call)); switchVideo(isVideoEnabled(call));
//Check media in progress
if(LinphonePreferences.instance().isVideoEnabled() && !call.mediaInProgress()){
video.setEnabled(true);
}
LinphoneManager.getLc().enableSpeaker(isSpeakerEnabled); LinphoneManager.getLc().enableSpeaker(isSpeakerEnabled);
isMicMuted = LinphoneManager.getLc().isMicMuted(); isMicMuted = LinphoneManager.getLc().isMicMuted();
@ -432,7 +433,7 @@ public class InCallActivity extends FragmentActivity implements OnClickListener
transfer.setEnabled(getResources().getBoolean(R.bool.allow_transfers)); transfer.setEnabled(getResources().getBoolean(R.bool.allow_transfers));
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()));
video.setEnabled(true); //video.setEnabled(true);
micro.setEnabled(true); micro.setEnabled(true);
if(!isTablet()){ if(!isTablet()){
speaker.setEnabled(true); speaker.setEnabled(true);