diff --git a/app/src/main/java/org/linphone/settings/SettingsFragment.java b/app/src/main/java/org/linphone/settings/SettingsFragment.java index a59345e0e..44751ec3b 100644 --- a/app/src/main/java/org/linphone/settings/SettingsFragment.java +++ b/app/src/main/java/org/linphone/settings/SettingsFragment.java @@ -52,7 +52,6 @@ import org.linphone.core.Core; import org.linphone.core.CoreListenerStub; import org.linphone.core.EcCalibratorStatus; import org.linphone.core.Factory; -import org.linphone.core.LimeState; import org.linphone.core.MediaEncryption; import org.linphone.core.PayloadType; import org.linphone.core.ProxyConfig; @@ -65,7 +64,6 @@ import org.linphone.mediastream.Version; import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration; import org.linphone.utils.DeviceUtils; import org.linphone.utils.FileUtils; -import org.linphone.utils.LinphoneUtils; import org.linphone.views.LedPreference; public class SettingsFragment extends PreferencesListFragment { @@ -260,10 +258,6 @@ public class SettingsFragment extends PreferencesListFragment { uncheckAndHidePreference(R.string.pref_debug_key); uncheckAndHidePreference(R.string.pref_java_debug_key); } - - if (!LinphoneManager.getLc().upnpAvailable()) { - uncheckAndHidePreference(R.string.pref_upnp_enable_key); - } } private void uncheckAndHidePreference(int preferenceKey) { @@ -531,36 +525,6 @@ public class SettingsFragment extends PreferencesListFragment { pref.setValue(value); } - private void initLimeEncryptionPreference(ListPreference pref) { - List entries = new ArrayList<>(); - List values = new ArrayList<>(); - entries.add(getString(R.string.lime_encryption_entry_disabled)); - values.add(LimeState.Disabled.toString()); - - Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); - if (lc == null || !lc.limeAvailable()) { - setListPreferenceValues(pref, entries, values); - pref.setEnabled(false); - return; - } - - entries.add(getString(R.string.lime_encryption_entry_mandatory)); - values.add(LimeState.Mandatory.toString()); - entries.add(getString(R.string.lime_encryption_entry_preferred)); - values.add(LimeState.Preferred.toString()); - setListPreferenceValues(pref, entries, values); - - LimeState lime = mPrefs.limeEnabled(); - if (lime == LimeState.Disabled) { - pref.setSummary(getString(R.string.lime_encryption_entry_disabled)); - } else if (lime == LimeState.Mandatory) { - pref.setSummary(getString(R.string.lime_encryption_entry_mandatory)); - } else if (lime == LimeState.Preferred) { - pref.setSummary(getString(R.string.lime_encryption_entry_preferred)); - } - pref.setValue(lime.toString()); - } - private void initAutoDownloadPolicyPreference(ListPreference pref) { int max_size = mPrefs.getAutoDownloadFileMaxSize(); if (max_size == -1) { @@ -1124,6 +1088,8 @@ public class SettingsFragment extends PreferencesListFragment { findPreference(getString(R.string.pref_incoming_call_vibration_key)); CheckBoxPreference autoAnswer = (CheckBoxPreference) findPreference(getString(R.string.pref_auto_answer_key)); + EditTextPreference autoAnswerTime = + (EditTextPreference) findPreference(getString(R.string.pref_auto_answer_time_key)); CheckBoxPreference rfc2833 = (CheckBoxPreference) findPreference(getString(R.string.pref_rfc2833_dtmf_key)); CheckBoxPreference sipInfo = @@ -1133,18 +1099,17 @@ public class SettingsFragment extends PreferencesListFragment { EditTextPreference incTimeout = (EditTextPreference) findPreference(getString(R.string.pref_incoming_call_timeout_key)); - EditTextPreference autoAnswerTime = - (EditTextPreference) findPreference(getString(R.string.pref_auto_answer_time_key)); rfc2833.setChecked(mPrefs.useRfc2833Dtmfs()); sipInfo.setChecked(mPrefs.useSipInfoDtmfs()); deviceRingtone.setChecked(mPrefs.isDeviceRingtoneEnabled()); incomingCallVibration.setChecked(mPrefs.isIncomingCallVibrationEnabled()); - autoAnswer.setChecked(mPrefs.isAutoAnswerEnabled()); incTimeout.setText(String.valueOf(mPrefs.getIncTimeout())); incTimeout.setSummary(String.valueOf(mPrefs.getIncTimeout())); + autoAnswer.setChecked(mPrefs.isAutoAnswerEnabled()); autoAnswerTime.setText(String.valueOf(mPrefs.getAutoAnswerTime())); autoAnswerTime.setSummary(String.valueOf(mPrefs.getAutoAnswerTime())); + if (mPrefs.isAutoAnswerEnabled()) { autoAnswerTime.setEnabled(true); } else { @@ -1330,19 +1295,9 @@ public class SettingsFragment extends PreferencesListFragment { }); } - private void setEncryptionZrtp() { - LinphoneUtils.displayErrorAlert( - getString(R.string.lime_encryption_enable_zrtp), LinphoneActivity.instance()); - mPrefs.setMediaEncryption(MediaEncryption.ZRTP); - findPreference(getString(R.string.pref_media_encryption_key)) - .setSummary(mPrefs.getMediaEncryption().toString()); - } - private void initChatSettings() { setPreferenceDefaultValueAndSummary( R.string.pref_image_sharing_server_key, mPrefs.getSharingPictureServerUrl()); - initLimeEncryptionPreference( - (ListPreference) findPreference(getString(R.string.pref_use_lime_encryption_key))); initAutoDownloadPolicyPreference( (ListPreference) findPreference(getString(R.string.pref_auto_download_policy_key))); int max_size = mPrefs.getAutoDownloadFileMaxSize(); @@ -1370,38 +1325,6 @@ public class SettingsFragment extends PreferencesListFragment { } }); - findPreference(getString(R.string.pref_use_lime_encryption_key)) - .setOnPreferenceChangeListener( - new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange( - Preference preference, Object newValue) { - String value = newValue.toString(); - LimeState lime = LimeState.Disabled; - if (value.equals(LimeState.Mandatory.toString())) - lime = LimeState.Mandatory; - else if (value.equals(LimeState.Preferred.toString())) - lime = LimeState.Preferred; - mPrefs.enableLime(lime); - - lime = mPrefs.limeEnabled(); - if (lime == LimeState.Disabled) { - preference.setSummary( - getString(R.string.lime_encryption_entry_disabled)); - } else if (lime == LimeState.Mandatory) { - setEncryptionZrtp(); - preference.setSummary( - getString(R.string.lime_encryption_entry_mandatory)); - } else if (lime == LimeState.Preferred) { - setEncryptionZrtp(); - preference.setSummary( - getString(R.string.lime_encryption_entry_preferred)); - } - - return true; - } - }); - findPreference(getString(R.string.pref_android_app_notif_settings_key)) .setOnPreferenceClickListener( new OnPreferenceClickListener() { @@ -1606,18 +1529,6 @@ public class SettingsFragment extends PreferencesListFragment { } }); - findPreference(getString(R.string.pref_upnp_enable_key)) - .setOnPreferenceChangeListener( - new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange( - Preference preference, Object newValue) { - boolean value = (Boolean) newValue; - mPrefs.setUpnpEnabled(value); - return true; - } - }); - findPreference(getString(R.string.pref_transport_use_random_ports_key)) .setOnPreferenceChangeListener( new OnPreferenceChangeListener() { diff --git a/app/src/main/res/values/non_localizable_strings.xml b/app/src/main/res/values/non_localizable_strings.xml index 0bd366991..0f6e4b1bd 100644 --- a/app/src/main/res/values/non_localizable_strings.xml +++ b/app/src/main/res/values/non_localizable_strings.xml @@ -87,7 +87,7 @@ pref_friendlist_subscribe_key pref_link_account_key pref_proxy_push_notif_key - pref_huawei_protected_settings_key + pref_device_power_saver_settings_key pref_echo_cancellation_key pref_autostart_key Outbound proxy diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 07c1deca4..5e7224f3e 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -133,6 +133,14 @@ android:summary="@string/pref_video_automatically_accept_video" android:title="@string/pref_video_automatically_accept_video_title" /> + + - - - - - + + + + + + + + + + - - - - - - - - - - - - @@ -415,6 +404,11 @@ android:persistent="false" android:title="@string/pref_autostart" /> + + - -