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

Can used RFC and SIP DMTF at the same time

Browse source
This commit is contained in:
Erwan Croze 2016-09-22 12:21:45 +02:00
parent 3eaf57ca70
commit 2b126d2d9c
3 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/values-fr/strings.xml
View file

@ -257,8 +257,8 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
<string name="pref_call_title">Appel</string>
<string name="pref_device_ringtone">Utiliser la sonnerie du téléphone</string>
<string name="pref_auto_answer">Décrocher automatiquement appels entrants</string>
<string name="pref_rfc2833_dtmf">Envoyer les DTMFs RFC2833</string>
<string name="pref_sipinfo_dtmf">Envoyer les DTMFs en SIP INFO</string>
<string name="pref_rfc2833_dtmf">Envoyer les DTMFs in-band (RFC2833)</string>
<string name="pref_sipinfo_dtmf">Envoyer les DTMFs out-band DTMFs(SIP INFO)</string>
<string name="pref_voice_mail">URI de boîte vocale</string>
<!--Chat settings-->
<string name="pref_chat_title">Chat</string>

4
res/values/strings.xml
View file

@ -277,8 +277,8 @@
<string name="pref_call_title">Call</string>
<string name="pref_device_ringtone">Use device ringtone</string>
<string name="pref_auto_answer">Auto answer incoming calls</string>
<string name="pref_rfc2833_dtmf">Send RFC2833 DTMFs</string>
<string name="pref_sipinfo_dtmf">Send SIP INFO DTMFs</string>
<string name="pref_rfc2833_dtmf">Send in-band DTMFs(RFC2833)</string>
<string name="pref_sipinfo_dtmf">Send out-band DTMFs(SIP INFO)</string>
<string name="pref_voice_mail">Voice mail URI</string>
<!-- Chat settings -->

19
src/org/linphone/SettingsFragment.java
View file

@ -877,16 +877,9 @@ public class SettingsFragment extends PreferencesListFragment {
deviceRingtone.setChecked(mPrefs.isDeviceRingtoneEnabled());
autoAnswer.setChecked(mPrefs.isAutoAnswerEnabled());
if (mPrefs.useRfc2833Dtmfs()) {
rfc2833.setChecked(true);
sipInfo.setChecked(false);
sipInfo.setEnabled(false);
} else if (mPrefs.useSipInfoDtmfs()) {
sipInfo.setChecked(true);
rfc2833.setChecked(false);
rfc2833.setEnabled(false);
}
rfc2833.setChecked(false);
sipInfo.setChecked(false);
setPreferenceDefaultValueAndSummary(R.string.pref_voice_mail_key, mPrefs.getVoiceMailUri());
}
@ -952,9 +945,6 @@ public class SettingsFragment extends PreferencesListFragment {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
boolean use = (Boolean) newValue;
CheckBoxPreference sipInfo = (CheckBoxPreference) findPreference(getString(R.string.pref_sipinfo_dtmf_key));
sipInfo.setEnabled(!use);
sipInfo.setChecked(false);
mPrefs.sendDtmfsAsRfc2833(use);
return true;
}
@ -975,9 +965,6 @@ public class SettingsFragment extends PreferencesListFragment {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
boolean use = (Boolean) newValue;
CheckBoxPreference rfc2833 = (CheckBoxPreference) findPreference(getString(R.string.pref_rfc2833_dtmf_key));
rfc2833.setEnabled(!use);
rfc2833.setChecked(false);
mPrefs.sendDTMFsAsSipInfo(use);
return true;
}