From 2b126d2d9c17ff814cb63540c7999733e4cf6022 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 22 Sep 2016 12:21:45 +0200
Subject: [PATCH] Can used RFC and SIP DMTF at the same time

---
 res/values-fr/strings.xml              |  4 ++--
 res/values/strings.xml                 |  4 ++--
 src/org/linphone/SettingsFragment.java | 19 +++----------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5aa8c3d23..e95fd7b80 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f9ab60831..a3392c522 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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 -->
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 4b91be9a0..ef1f10fc2 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -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;
 			}