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

Added preference for incoming call timeout

Browse source
This commit is contained in:
Sylvain Berfini 2012-10-15 15:50:45 +02:00
parent d236fcb7a5
commit b27bf61157
6 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,6 +117,7 @@
<string name="pref_audio_port_title">Port ou plage de port audio</string> <string name="pref_audio_port_title">Port ou plage de port audio</string>
<string name="pref_video_port_description">Port ou plage (min-max) pour l\'audio</string> <string name="pref_video_port_description">Port ou plage (min-max) pour l\'audio</string>
<string name="pref_audio_port_description">Port ou plage (min-max) pour la video</string> <string name="pref_audio_port_description">Port ou plage (min-max) pour la video</string>
<string name="pref_incoming_call_timeout_title">Timeout (en secondes) pour les appels entrants</string>
<string name="pref_debug">Activer les traces de débogage</string> <string name="pref_debug">Activer les traces de débogage</string>
<string name="about_report_issue">Reporter un problème</string> <string name="about_report_issue">Reporter un problème</string>

3
res/values/non_localizable_strings.xml
View file

@ -93,6 +93,5 @@
<string name="pref_video_port_key">pref_video_port_key</string> <string name="pref_video_port_key">pref_video_port_key</string>
<string name="pref_audio_port_key">pref_audio_port_key</string> <string name="pref_audio_port_key">pref_audio_port_key</string>
<string name="pref_incoming_expire_key">pref_incoming_expire_key</string> <string name="pref_incoming_call_timeout_key">pref_incoming_expire_key</string>
<string name="pref_communication_expire_key">pref_communication_expire_key</string>
</resources> </resources>

1
res/values/strings.xml
View file

@ -163,6 +163,7 @@
<string name="pref_audio_port_title">Audio port or port range</string> <string name="pref_audio_port_title">Audio port or port range</string>
<string name="pref_video_port_description">Video port or port range (minport-maxport)</string> <string name="pref_video_port_description">Video port or port range (minport-maxport)</string>
<string name="pref_audio_port_description">Audio port or port range (minport-maxport)</string> <string name="pref_audio_port_description">Audio port or port range (minport-maxport)</string>
<string name="pref_incoming_call_timeout_title">Incoming call timeout (in seconds)</string>
<string name="place_call_chooser">Place a call</string> <string name="place_call_chooser">Place a call</string>
<string name="pref_debug">Debug</string> <string name="pref_debug">Debug</string>

6
res/xml/preferences.xml
View file

@ -252,6 +252,12 @@
<CheckBoxPreference <CheckBoxPreference
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"/>
<EditTextPreference
android:key="@string/pref_incoming_call_timeout_key"
android:title="@string/pref_incoming_call_timeout_title"
android:defaultValue="30"
android:layout="@layout/hidden"/>
<CheckBoxPreference <CheckBoxPreference
android:key="@string/pref_debug_key" android:key="@string/pref_debug_key"

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

@ -698,6 +698,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
readAndSetAudioAndVideoPorts(); readAndSetAudioAndVideoPorts();
int incomingCallTimeout = Integer.parseInt(getPrefString(R.string.pref_incoming_call_timeout_key, "30"));
mLc.setIncomingTimeout(incomingCallTimeout);
try { try {
// Configure audio codecs // Configure audio codecs
// enableDisableAudioCodec("speex", 32000, 1, R.string.pref_codec_speex32_key); // enableDisableAudioCodec("speex", 32000, 1, R.string.pref_codec_speex32_key);

2
submodules/linphone

@ -1 +1 @@
Subproject commit 78a66ffc91e960f4cd3379495f02a00898235f3e Subproject commit 30032453d692bf5440a9b90f830c19f559a72005