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

Fix initiateVideoCall issue with shareMyCamera

Browse source
This commit is contained in:
Sylvain Berfini 2012-03-14 11:16:44 +01:00
parent b726a7b0c8
commit 772d1d642c
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,7 +115,6 @@ public class IncallActivity extends AbstractCalleesActivity implements
} }
setContentView(R.layout.incall_layout); setContentView(R.layout.incall_layout);
instance = this; instance = this;
LinphoneManager.getInstance().setVideoInitiator(false);
mAllowTransfers = getResources().getBoolean(R.bool.allow_transfers); mAllowTransfers = getResources().getBoolean(R.bool.allow_transfers);

6
src/org/linphone/LinphoneManager.java
View file

@ -63,7 +63,6 @@ import org.linphone.core.LinphoneCore.GlobalState;
import org.linphone.core.LinphoneCore.MediaEncryption; import org.linphone.core.LinphoneCore.MediaEncryption;
import org.linphone.core.LinphoneCore.RegistrationState; import org.linphone.core.LinphoneCore.RegistrationState;
import org.linphone.core.LinphoneCore.Transports; import org.linphone.core.LinphoneCore.Transports;
import org.linphone.core.LinphoneCallParams;
import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreException;
import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreFactory;
import org.linphone.core.LinphoneCoreListener; import org.linphone.core.LinphoneCoreListener;
@ -1333,8 +1332,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
public void onCallStateChanged(LinphoneCall call, State state, public void onCallStateChanged(LinphoneCall call, State state,
String message) { String message) {
if (state==State.OutgoingInit || state==State.IncomingReceived) { if (state == State.OutgoingInit || state == State.IncomingReceived) {
boolean sendCamera = shareMyCamera() && mLc.getConferenceSize() == 0; setVideoInitiator(state == State.OutgoingInit);
boolean sendCamera = mLc.getConferenceSize() == 0;
enableCamera(call, sendCamera); enableCamera(call, sendCamera);
} }
if (state == State.CallEnd && mLc.getCallsNb() == 0) { if (state == State.CallEnd && mLc.getCallsNb() == 0) {