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

Update dependencies.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-10-14 16:58:55 +02:00
parent fc67293df4
commit d1be587f12
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/org/linphone/DialerActivity.java
View file

@ -86,7 +86,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
private PowerManager.WakeLock mWakeLock; private PowerManager.WakeLock mWakeLock;
private SharedPreferences mPref; private SharedPreferences mPref;
private LinphoneCall mCurrentCall;
private boolean useIncallActivity; private boolean useIncallActivity;
private boolean useVideoActivity; private boolean useVideoActivity;
private boolean useConferenceActivity; private boolean useConferenceActivity;
@ -442,7 +441,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
public void onCallStateChanged(LinphoneCall call, State state, String message) { public void onCallStateChanged(LinphoneCall call, State state, String message) {
Log.i("OnCallStateChanged: call=", call, ", state=", state, ", message=", message, ", currentCall=", mCurrentCall); Log.i("OnCallStateChanged: call=", call, ", state=", state, ", message=", message);
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if (lc==null) { if (lc==null) {
/* we are certainly exiting, ignore then.*/ /* we are certainly exiting, ignore then.*/
@ -450,12 +449,10 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
} }
if (state==LinphoneCall.State.OutgoingInit){ if (state==LinphoneCall.State.OutgoingInit){
mCurrentCall=call;
call.enableCamera(LinphoneManager.getInstance().shareMyCamera()); call.enableCamera(LinphoneManager.getInstance().shareMyCamera());
enterIncallMode(lc); enterIncallMode(lc);
LinphoneActivity.instance().startOrientationSensor(); LinphoneActivity.instance().startOrientationSensor();
}else if (state==LinphoneCall.State.IncomingReceived){ }else if (state==LinphoneCall.State.IncomingReceived){
mCurrentCall=call;
callPending(call); callPending(call);
call.enableCamera(LinphoneManager.getInstance().shareMyCamera()); call.enableCamera(LinphoneManager.getInstance().shareMyCamera());
LinphoneActivity.instance().startOrientationSensor(); LinphoneActivity.instance().startOrientationSensor();
@ -469,13 +466,11 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
if (mWakeLock.isHeld()) mWakeLock.release(); if (mWakeLock.isHeld()) mWakeLock.release();
exitCallMode(); exitCallMode();
LinphoneActivity.instance().stopOrientationSensor(); LinphoneActivity.instance().stopOrientationSensor();
mCurrentCall=null;
} }
}else if (state==LinphoneCall.State.CallEnd){ }else if (state==LinphoneCall.State.CallEnd){
if (lc.getCallsNb() == 0){ if (lc.getCallsNb() == 0){
exitCallMode(); exitCallMode();
LinphoneActivity.instance().stopOrientationSensor(); LinphoneActivity.instance().stopOrientationSensor();
mCurrentCall=null;
} }
} }

2
submodules/externals/osip vendored

@ -1 +1 @@
Subproject commit c27b9b6702f62cdbd2143c1ccc85b8980b83adac Subproject commit 9e8c64cff496d2794fe352a6a3907e0e36988931

2
submodules/linphone

@ -1 +1 @@
Subproject commit a0f8cbb73c1c028182972147d1ce3f0fdae2921f Subproject commit e740628ab7cb69acae8751572506dfc840028607