From 32b615392226d5410051a3563d38f8fcc17c27cc Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 29 Nov 2012 17:02:23 +0100
Subject: [PATCH] Added settings to manage DTMFs

---
 res/values-FR/strings.xml               |  5 ++++-
 res/values/non_localizable_defaults.xml |  3 +++
 res/values/non_localizable_strings.xml  |  3 +++
 res/values/strings.xml                  |  3 +++
 res/xml/preferences.xml                 | 10 ++++++++++
 src/org/linphone/LinphoneManager.java   | 11 +++++++----
 submodules/linphone                     |  2 +-
 7 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index 4e519103f..780fb6a09 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -130,7 +130,7 @@
 	<string name="menu_about">A propos</string>
 	<string name="pref_audio">Audio</string>
 	<string name="menu_exit">Quitter</string>
-	<string name="pref_prefix">Préfix</string>
+	<string name="pref_prefix">Préfixe</string>
 	<string name="pref_advanced">Avancé</string>
 	<string name="menu_settings">Paramètres</string>
 	<string name="pref_proxy">Serveur mandataire</string>
@@ -353,4 +353,7 @@
 	<string name="pref_user_name_title">Nom d\'utilisateur</string>
 	<string name="pref_expire_title">Expiration</string>
 	
+	<string name="pref_rfc2833_dtmf">Envoyer les DTMFs RFC2833</string>
+	<string name="pref_inband_dtmf">Envoyer les DTMFs en SIP INFO</string>
+	
 </resources>
diff --git a/res/values/non_localizable_defaults.xml b/res/values/non_localizable_defaults.xml
index e41e74da7..b290635e8 100644
--- a/res/values/non_localizable_defaults.xml
+++ b/res/values/non_localizable_defaults.xml
@@ -57,4 +57,7 @@
     
     <bool name="pref_auto_accept_friends_default">false</bool>
     
+    <bool name="pref_sipinfo_dtmf_default">false</bool>
+    <bool name="pref_rfc2833_dtmf_default">true</bool>
+    
 </resources>
\ No newline at end of file
diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index cc82cf109..fb98ee49b 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -106,4 +106,7 @@
     <string name="pref_display_name_key">pref_display_name_key</string>
     <string name="pref_user_name_key">pref_user_name_key</string>
     <string name="pref_expire_key">pref_expire_key</string>
+    
+	<string name="pref_rfc2833_dtmf_key">pref_rfc2833_dtmf_key</string>
+	<string name="pref_sipinfo_dtmf_key">pref_sipinfo_dtmf_key</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aa07f3cdb..8f4c8c82c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -399,4 +399,7 @@
 	<string name="pref_display_name_title">Display name</string>
 	<string name="pref_user_name_title">Username</string>
 	<string name="pref_expire_title">Expire</string>
+	
+	<string name="pref_rfc2833_dtmf">Send RFC2833 DTMFs</string>
+	<string name="pref_sipinfo_dtmf">Send SIP INFO DTMFs</string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 54e0b8cfe..786874196 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -201,6 +201,16 @@
 			<CheckBoxPreference 
 			    android:key="@string/pref_escape_plus_key"
 				android:title="@string/pref_escape_plus"/>
+			
+			<CheckBoxPreference 
+			    android:key="@string/pref_sipinfo_dtmf_key"
+			    android:defaultValue="@bool/pref_sipinfo_dtmf_default"
+				android:title="@string/pref_sipinfo_dtmf"/>
+			
+			<CheckBoxPreference 
+			    android:key="@string/pref_rfc2833_dtmf_key"
+			    android:defaultValue="@bool/pref_rfc2833_dtmf_default"
+				android:title="@string/pref_rfc2833_dtmf"/>
 				
 	    </PreferenceScreen>
 		
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index d42e3e9ee..beba48b37 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -762,6 +762,13 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			mLc.setFirewallPolicy(FirewallPolicy.NoFirewall);
 		}
 		
+		mLc.setUseRfc2833ForDtmfs(getPrefBoolean(R.string.pref_rfc2833_dtmf_key, mR.getBoolean(R.bool.pref_rfc2833_dtmf_default)));
+		mLc.setUseSipInfoForDtmfs(getPrefBoolean(R.string.pref_sipinfo_dtmf_key, mR.getBoolean(R.bool.pref_sipinfo_dtmf_default)));
+
+		String displayName = getPrefString(R.string.pref_display_name_key, getString(R.string.pref_display_name_default));
+		String username = getPrefString(R.string.pref_user_name_key, getString(R.string.pref_user_name_default));
+		mLc.setPrimaryContact(displayName, username);
+		
 		//accounts
 		try {
 			initAccounts();
@@ -778,10 +785,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		} catch (LinphoneCoreException e) {
 			throw new LinphoneConfigException(getString(R.string.wrong_settings),e);
 		}
-		
-		String displayName = getPrefString(R.string.pref_display_name_key, getString(R.string.pref_display_name_default));
-		String username = getPrefString(R.string.pref_user_name_key, getString(R.string.pref_user_name_default));
-		mLc.setPrimaryContact(displayName, username);
 	}
 	
 	private void setSignalingTransportsFromConfiguration(Transports t) {
diff --git a/submodules/linphone b/submodules/linphone
index 2c5421f22..07c412060 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2c5421f22e37952123d4cd06bf3b13da80a1e86f
+Subproject commit 07c4120600ac9e7060f619fa2b94a7b29cbe79da