From 0302654fbd795e1c3a90e011baabd8dabdd8fcd7 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Fri, 26 Feb 2016 15:56:33 +0100 Subject: [PATCH] Fix outgoincall resuming and proximity sensor --- src/org/linphone/CallActivity.java | 2 ++ src/org/linphone/LinphoneActivity.java | 12 +++++++++--- src/org/linphone/LinphoneManager.java | 5 +---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java index ebd0a260a..1506771d1 100644 --- a/src/org/linphone/CallActivity.java +++ b/src/org/linphone/CallActivity.java @@ -1416,6 +1416,8 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve mControls = null; mControlsHandler = null; + mSensorManager.unregisterListener(this); + unbindDrawables(findViewById(R.id.topLayout)); instance = null; super.onDestroy(); diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index f17e0aa20..d040cd7b7 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -119,6 +119,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta private RelativeLayout sideMenuContent, quitLayout, defaultAccount; private ListView accountsList, sideMenuItemList; private ImageView menu; + private Dialog authInfoPassword; static final boolean isInstanciated() { return instance != null; @@ -196,6 +197,12 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta } } + @Override + public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) { + //authInfoPassword = displayWrongPasswordDialog(username, realm, domain); + //authInfoPassword.show(); + } + @Override public void registrationState(LinphoneCore lc, LinphoneProxyConfig proxy, LinphoneCore.RegistrationState state, String smessage) { if (state.equals(RegistrationState.RegistrationCleared)) { @@ -211,7 +218,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta if(state.equals(RegistrationState.RegistrationFailed) && newProxyConfig) { newProxyConfig = false; if (proxy.getError() == Reason.BadCredentials) { - displayCustomToast(getString(R.string.error_bad_credentials), Toast.LENGTH_LONG); + //displayCustomToast(getString(R.string.error_bad_credentials), Toast.LENGTH_LONG); } if (proxy.getError() == Reason.Unauthorized) { displayCustomToast(getString(R.string.error_unauthorized), Toast.LENGTH_LONG); @@ -827,7 +834,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta Bundle bundle = new Bundle(); bundle.putInt("Account", accountNumber); changeCurrentFragment(FragmentsAvailable.ACCOUNT_SETTINGS, bundle); - mTabBar.setVisibility(View.VISIBLE); //settings.setSelected(true); } @@ -1199,7 +1205,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta LinphoneCall.State callState = call.getState(); if (callState == State.IncomingReceived) { startActivity(new Intent(this, CallIncomingActivity.class)); - } else if (callState == State.OutgoingInit) { + } else if (callState == State.OutgoingInit || callState == State.OutgoingProgress || callState == State.OutgoingRinging) { startActivity(new Intent(this, CallOutgoingActivity.class)); } else { if (call.getCurrentParamsCopy().getVideoEnabled()) { diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index f69301a21..3597dc56f 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -829,10 +829,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag public void displayWarning(LinphoneCore lc, String message) {} - public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) { - //Dialog authInfoPassword = LinphoneActivity.instance().displayPasswordDialog(username, realm, domain); - //authInfoPassword.show(); - } + public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) {} public void byeReceived(LinphoneCore lc, String from) {} public void displayMessage(LinphoneCore lc, String message) {} public void show(LinphoneCore lc) {}