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

Merging commit from closed #172 pull request and fixed it

Browse source
This commit is contained in:
Erwan Croze 2018-01-05 15:38:34 +01:00
parent 3f33835f15
commit 2096f2730d
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/android/org/linphone/CallActivity.java
View file

@ -132,6 +132,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private HashMap<String, String> mEncoderTexts; private HashMap<String, String> mEncoderTexts;
private HashMap<String, String> mDecoderTexts; private HashMap<String, String> mDecoderTexts;
private boolean oldIsSpeakerEnabled = false;
public static CallActivity instance() { public static CallActivity instance() {
return instance; return instance;
} }
@ -1255,6 +1257,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
LinphoneManager.getInstance().changeStatusToOnline(); LinphoneManager.getInstance().changeStatusToOnline();
LinphoneManager.getInstance().enableProximitySensing(false); LinphoneManager.getInstance().enableProximitySensing(false);
unregisterReceiver(headsetReceiver);
if (mControlsHandler != null && mControls != null) { if (mControlsHandler != null && mControls != null) {
mControlsHandler.removeCallbacks(mControls); mControlsHandler.removeCallbacks(mControls);
} }
@ -1766,13 +1770,15 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
if (intent.hasExtra("state")) { if (intent.hasExtra("state")) {
switch (intent.getIntExtra("state", 0)) { switch (intent.getIntExtra("state", 0)) {
case 0: case 0:
LinphoneManager.getInstance().routeAudioToSpeaker(); if (oldIsSpeakerEnabled) {
isSpeakerEnabled = true; LinphoneManager.getInstance().routeAudioToSpeaker();
speaker.setEnabled(true); isSpeakerEnabled = true;
refreshInCallActions(); speaker.setEnabled(true);
}
break; break;
case 1: case 1:
LinphoneManager.getInstance().routeAudioToReceiver(); LinphoneManager.getInstance().routeAudioToReceiver();
oldIsSpeakerEnabled = isSpeakerEnabled;
isSpeakerEnabled = false; isSpeakerEnabled = false;
speaker.setEnabled(false); speaker.setEnabled(false);
break; break;