From 9ecd852a23c7f3efd95877e9ac79dbc27e19d208 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 2 Oct 2012 16:21:56 +0200 Subject: [PATCH] Some fixes --- src/org/linphone/InCallActivity.java | 15 +++++++++------ src/org/linphone/LinphoneActivity.java | 4 +++- src/org/linphone/LinphoneManager.java | 2 +- src/org/linphone/LinphoneService.java | 8 ++++---- src/org/linphone/core/LinphoneAuthInfoImpl.java | 2 +- src/org/linphone/core/LinphoneCallLogImpl.java | 5 +++++ submodules/linphone | 2 +- 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index 2f7bdfbd1..b4bac9c8e 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -29,6 +29,7 @@ import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCoreException; import org.linphone.core.Log; import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration; +import org.linphone.mediastream.video.capture.hwconf.Hacks; import org.linphone.ui.Numpad; import android.app.Activity; @@ -100,7 +101,7 @@ public class InCallActivity extends FragmentActivity implements super.onCreate(savedInstanceState); instance = this; - getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); setContentView(R.layout.incall); isVideoEnabled = getIntent().getExtras() != null && getIntent().getExtras().getBoolean("VideoEnabled"); @@ -870,12 +871,14 @@ public class InCallActivity extends FragmentActivity implements switchVideo(isVideoEnabled); } else { //Hack to fix Galaxy S issue - if (isSpeakerEnabled) { - LinphoneManager.getInstance().routeAudioToSpeaker(); - } else { - LinphoneManager.getInstance().routeAudioToReceiver(); + if (Hacks.needGalaxySAudioHack()) { + if (isSpeakerEnabled) { + LinphoneManager.getInstance().routeAudioToSpeaker(); + } else { + LinphoneManager.getInstance().routeAudioToReceiver(); + } + LinphoneManager.getLc().enableSpeaker(isSpeakerEnabled); } - LinphoneManager.getLc().enableSpeaker(isSpeakerEnabled); } isMicMuted = LinphoneManager.getLc().isMicMuted(); diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 730db276d..37ba6e9d5 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -1125,7 +1125,9 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene } } } else if (keyCode == KeyEvent.KEYCODE_MENU && statusFragment != null) { - statusFragment.openOrCloseStatusBar(); + if (event.getRepeatCount() < 1) { + statusFragment.openOrCloseStatusBar(); + } } return super.onKeyDown(keyCode, event); } diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 82b05a658..eae337382 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -608,7 +608,7 @@ public final class LinphoneManager implements LinphoneCoreListener { String password = getPrefString(getString(R.string.pref_passwd_key) + key, null); String domain = getPrefString(getString(R.string.pref_domain_key) + key, null); if (username != null && username.length() > 0) { - LinphoneAuthInfo lAuthInfo = LinphoneCoreFactory.instance().createAuthInfo(username, password, domain); + LinphoneAuthInfo lAuthInfo = LinphoneCoreFactory.instance().createAuthInfo(username, password, null); mLc.addAuthInfo(lAuthInfo); if (domain != null && domain.length() > 0) { diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index e65253be3..d121aaf98 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -501,10 +501,10 @@ public final class LinphoneService extends Service implements LinphoneServiceLis public void onRegistrationStateChanged(final RegistrationState state, final String message) { - if (instance == null) { - Log.i("Service not ready, discarding registration state change to ",state.toString()); - return; - } +// if (instance == null) { +// Log.i("Service not ready, discarding registration state change to ",state.toString()); +// return; +// } if (state == RegistrationState.RegistrationOk && LinphoneManager.getLc().getDefaultProxyConfig().isRegistered()) { sendNotification(IC_LEVEL_ORANGE, R.string.notification_registered); } diff --git a/src/org/linphone/core/LinphoneAuthInfoImpl.java b/src/org/linphone/core/LinphoneAuthInfoImpl.java index 7f9e54dd2..7d50a2fa5 100644 --- a/src/org/linphone/core/LinphoneAuthInfoImpl.java +++ b/src/org/linphone/core/LinphoneAuthInfoImpl.java @@ -23,7 +23,7 @@ class LinphoneAuthInfoImpl implements LinphoneAuthInfo { private native long newLinphoneAuthInfo(String username, String userid, String passwd, String ha1,String realm); private native void delete(long ptr); protected LinphoneAuthInfoImpl(String username,String password, String realm) { - nativePtr = newLinphoneAuthInfo(username,null,password,null,realm); + nativePtr = newLinphoneAuthInfo(username,"",password,"",""); } protected void finalize() throws Throwable { delete(nativePtr); diff --git a/src/org/linphone/core/LinphoneCallLogImpl.java b/src/org/linphone/core/LinphoneCallLogImpl.java index 8972f0a76..ac03d3699 100644 --- a/src/org/linphone/core/LinphoneCallLogImpl.java +++ b/src/org/linphone/core/LinphoneCallLogImpl.java @@ -29,6 +29,7 @@ class LinphoneCallLogImpl implements LinphoneCallLog { private native int getStatus(long nativePtr); private native String getStartDate(long nativePtr); private native int getCallDuration(long nativePtr); + private native int getCallId(long nativePtr); LinphoneCallLogImpl(long aNativePtr) { nativePtr = aNativePtr; @@ -60,4 +61,8 @@ class LinphoneCallLogImpl implements LinphoneCallLog { public int getCallDuration() { return getCallDuration(nativePtr); } + @Override + public int getCallId() { + return getCallId(nativePtr); + } } diff --git a/submodules/linphone b/submodules/linphone index 438a8f4f7..61312092b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 438a8f4f73e54aa53cd9ac349f354601704a5862 +Subproject commit 61312092bbda523c8fa98c9804d123a5308d2e57