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

Start incall act. from incoming call act.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-11-28 19:56:05 +01:00
parent 889bd26ea0
commit c4a81663cf
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/IncomingCallActivity.java
View file

@ -140,6 +140,8 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat
if (!LinphoneManager.getInstance().acceptCall(mCall)) { if (!LinphoneManager.getInstance().acceptCall(mCall)) {
// the above method takes care of Samsung Galaxy S // the above method takes care of Samsung Galaxy S
Toast.makeText(this, R.string.couldnt_accept_call, Toast.LENGTH_LONG); Toast.makeText(this, R.string.couldnt_accept_call, Toast.LENGTH_LONG);
} else {
LinphoneActivity.instance().startIncallActivity();
} }
} }
@Override @Override

5
src/org/linphone/LinphoneActivity.java
View file

@ -492,11 +492,6 @@ public class LinphoneActivity extends TabActivity implements
stopOrientationSensor(); stopOrientationSensor();
finishActivity(INCOMING_CALL_ACTIVITY); finishActivity(INCOMING_CALL_ACTIVITY);
} }
if (state==State.Connected) {
if (call.getDirection() == CallDirection.Incoming) {
startIncallActivity();
}
}
if (state == LinphoneCall.State.StreamsRunning && Version.isVideoCapable() && !call.isInConference()) { if (state == LinphoneCall.State.StreamsRunning && Version.isVideoCapable() && !call.isInConference()) {
boolean videoEnabled = call.getCurrentParamsCopy().getVideoEnabled(); boolean videoEnabled = call.getCurrentParamsCopy().getVideoEnabled();
if (videoEnabled) { if (videoEnabled) {