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

Merge branch 'master' of belledonne-communications.com:linphone-android

Browse source 
Conflicts:
	src/org/linphone/DialerActivity.java
This commit is contained in:
Jehan Monnier 2010-12-14 12:34:42 +01:00
commit 6af2b1ad73
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -239,7 +239,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
if (lLinphoneCore.isIncall()) {
mCurrentCallState = lLinphoneCore.getCurrentCall().getState();
if(lLinphoneCore.isInComingInvitePending()) {
callPending();
callPending(lLinphoneCore.getCurrentCall());
} else {
mCall.setEnabled(false);
mHangup.setEnabled(!mCall.isEnabled());
@ -460,7 +460,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
routeAudioToReceiver();
} else if (state == LinphoneCall.State.IncomingReceived) {
resetCameraFromPreferences();
callPending();
callPending(call);
} else if (state == LinphoneCall.State.Connected) {
enterIncalMode(lc);
} else if (state == LinphoneCall.State.Error) {
@ -569,7 +569,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
mAudioManager.setSpeakerphoneOn(false);
}
}
private void callPending() {
private void callPending(LinphoneCall call) {
mDecline.setEnabled(true);
//routeAudioToSpeaker();
@ -577,6 +577,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
boolean prefVideoEnable = mPref.getBoolean(getString(R.string.pref_video_enable_key), false);
boolean prefAutomaticallyShareMyCamera = mPref.getBoolean(getString(R.string.pref_video_automatically_share_my_video_key), false);
getVideoManager().setMuted(!(prefVideoEnable && prefAutomaticallyShareMyCamera));
call.enableCamera(prefAutomaticallyShareMyCamera);
startRinging();
}
public void newOutgoingCall(String aTo) {
@ -727,4 +728,3 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
}

3
src/org/linphone/LinphoneService.java
View file

@ -186,7 +186,8 @@ public class LinphoneService extends Service implements LinphoneCoreListener {
if (DialerActivity.getDialer()!=null) {
mHandler.post(new Runnable() {
public void run() {
DialerActivity.getDialer().displayStatus(lc,message);
if (DialerActivity.getDialer()!=null)
DialerActivity.getDialer().displayStatus(lc,message);
}
});

2
submodules/linphone

@ -1 +1 @@
Subproject commit 6ff25215befafa58466eea541beae27d2d685e7f
Subproject commit de0d399e989d02f42bf70a5ebf7ab19f1762e902