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

Added settings to manage DTMFs

Browse source
This commit is contained in:
Sylvain Berfini 2012-11-29 17:02:23 +01:00
parent 9fea3b8fbb
commit 32b6153922
7 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/values-FR/strings.xml
View file

@ -130,7 +130,7 @@
<string name="menu_about">A propos</string> <string name="menu_about">A propos</string>
<string name="pref_audio">Audio</string> <string name="pref_audio">Audio</string>
<string name="menu_exit">Quitter</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="pref_advanced">Avancé</string>
<string name="menu_settings">Paramètres</string> <string name="menu_settings">Paramètres</string>
<string name="pref_proxy">Serveur mandataire</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_user_name_title">Nom d\'utilisateur</string>
<string name="pref_expire_title">Expiration</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> </resources>

3
res/values/non_localizable_defaults.xml
View file

@ -57,4 +57,7 @@
<bool name="pref_auto_accept_friends_default">false</bool> <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> </resources>

3
res/values/non_localizable_strings.xml
View file

@ -106,4 +106,7 @@
<string name="pref_display_name_key">pref_display_name_key</string> <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_user_name_key">pref_user_name_key</string>
<string name="pref_expire_key">pref_expire_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> </resources>

3
res/values/strings.xml
View file

@ -399,4 +399,7 @@
<string name="pref_display_name_title">Display name</string> <string name="pref_display_name_title">Display name</string>
<string name="pref_user_name_title">Username</string> <string name="pref_user_name_title">Username</string>
<string name="pref_expire_title">Expire</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> </resources>

10
res/xml/preferences.xml
View file

@ -202,6 +202,16 @@
android:key="@string/pref_escape_plus_key" android:key="@string/pref_escape_plus_key"
android:title="@string/pref_escape_plus"/> 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> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen

11
src/org/linphone/LinphoneManager.java
View file

@ -762,6 +762,13 @@ public final class LinphoneManager implements LinphoneCoreListener {
mLc.setFirewallPolicy(FirewallPolicy.NoFirewall); 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 //accounts
try { try {
initAccounts(); initAccounts();
@ -778,10 +785,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
} catch (LinphoneCoreException e) { } catch (LinphoneCoreException e) {
throw new LinphoneConfigException(getString(R.string.wrong_settings),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) { private void setSignalingTransportsFromConfiguration(Transports t) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2c5421f22e37952123d4cd06bf3b13da80a1e86f Subproject commit 07c4120600ac9e7060f619fa2b94a7b29cbe79da