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

Add option to set time of incoming timeout

Browse source 
close #56
This commit is contained in:
Erwan Croze 2017-06-05 17:33:16 +02:00
parent 9b28d555fe
commit b4292e61dc
4 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
res/xml/preferences.xml
View file

@ -206,6 +206,12 @@
android:key="@string/pref_auto_answer_key"
android:persistent="false"/>
<EditTextPreference
android:title="@string/pref_incoming_call_timeout_title"
android:key="@string/pref_incoming_call_timeout_key"
android:numeric="integer"
android:persistent="false"/>
<EditTextPreference
android:title="@string/pref_voice_mail"
android:key="@string/pref_voice_mail_key"

8
src/android/org/linphone/LinphonePreferences.java
View file

@ -976,6 +976,14 @@ public class LinphonePreferences {
getLc().setUseSipInfoForDtmfs(use);
}
public int getIncTimeout() {
return getLc().getIncomingTimeout();
}
public void setIncTimeout(int timeout) {
getLc().setIncomingTimeout(timeout);
}
public String getVoiceMailUri() {
return getConfig().getString("app", "voice_mail", null);
}

14
src/android/org/linphone/SettingsFragment.java
View file

@ -860,11 +860,15 @@ public class SettingsFragment extends PreferencesListFragment {
CheckBoxPreference autoAnswer = (CheckBoxPreference) findPreference(getString(R.string.pref_auto_answer_key));
CheckBoxPreference rfc2833 = (CheckBoxPreference) findPreference(getString(R.string.pref_rfc2833_dtmf_key));
CheckBoxPreference sipInfo = (CheckBoxPreference) findPreference(getString(R.string.pref_sipinfo_dtmf_key));
EditTextPreference incTimeout = (EditTextPreference) findPreference(getString(R.string.pref_incoming_call_timeout_key));
rfc2833.setChecked(mPrefs.useRfc2833Dtmfs());
sipInfo.setChecked(mPrefs.useSipInfoDtmfs());
deviceRingtone.setChecked(mPrefs.isDeviceRingtoneEnabled());
autoAnswer.setChecked(mPrefs.isAutoAnswerEnabled());
incTimeout.setText(String.valueOf(mPrefs.getIncTimeout()));
incTimeout.setSummary((String.valueOf(mPrefs.getIncTimeout())));
setPreferenceDefaultValueAndSummary(R.string.pref_voice_mail_key, mPrefs.getVoiceMailUri());
}
@ -954,6 +958,16 @@ public class SettingsFragment extends PreferencesListFragment {
return true;
}
});
findPreference(getString(R.string.pref_incoming_call_timeout_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
String value = (String) newValue;
mPrefs.setIncTimeout(Integer.valueOf(value));
preference.setSummary(value);
return true;
}
});
}
private void setEncryptionZrtp() {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 9a46a2ac3e3aeaef26b63c51f8f14e5e8cb405f9
Subproject commit af93de9a95171530c93e22919e88f0db0d785919