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

Some cleaning in settings

Browse source
This commit is contained in:
Sylvain Berfini 2019-03-14 16:45:27 +01:00
parent a17b19e43b
commit bf88723f28
3 changed files with 45 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
app/src/main/java/org/linphone/settings/SettingsFragment.java
View file

@ -52,7 +52,6 @@ import org.linphone.core.Core;
import org.linphone.core.CoreListenerStub; import org.linphone.core.CoreListenerStub;
import org.linphone.core.EcCalibratorStatus; import org.linphone.core.EcCalibratorStatus;
import org.linphone.core.Factory; import org.linphone.core.Factory;
import org.linphone.core.LimeState;
import org.linphone.core.MediaEncryption; import org.linphone.core.MediaEncryption;
import org.linphone.core.PayloadType; import org.linphone.core.PayloadType;
import org.linphone.core.ProxyConfig; 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.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
import org.linphone.utils.DeviceUtils; import org.linphone.utils.DeviceUtils;
import org.linphone.utils.FileUtils; import org.linphone.utils.FileUtils;
import org.linphone.utils.LinphoneUtils;
import org.linphone.views.LedPreference; import org.linphone.views.LedPreference;
public class SettingsFragment extends PreferencesListFragment { public class SettingsFragment extends PreferencesListFragment {
@ -260,10 +258,6 @@ public class SettingsFragment extends PreferencesListFragment {
uncheckAndHidePreference(R.string.pref_debug_key); uncheckAndHidePreference(R.string.pref_debug_key);
uncheckAndHidePreference(R.string.pref_java_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) { private void uncheckAndHidePreference(int preferenceKey) {
@ -531,36 +525,6 @@ public class SettingsFragment extends PreferencesListFragment {
pref.setValue(value); pref.setValue(value);
} }
private void initLimeEncryptionPreference(ListPreference pref) {
List<CharSequence> entries = new ArrayList<>();
List<CharSequence> 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) { private void initAutoDownloadPolicyPreference(ListPreference pref) {
int max_size = mPrefs.getAutoDownloadFileMaxSize(); int max_size = mPrefs.getAutoDownloadFileMaxSize();
if (max_size == -1) { if (max_size == -1) {
@ -1124,6 +1088,8 @@ public class SettingsFragment extends PreferencesListFragment {
findPreference(getString(R.string.pref_incoming_call_vibration_key)); findPreference(getString(R.string.pref_incoming_call_vibration_key));
CheckBoxPreference autoAnswer = CheckBoxPreference autoAnswer =
(CheckBoxPreference) findPreference(getString(R.string.pref_auto_answer_key)); (CheckBoxPreference) findPreference(getString(R.string.pref_auto_answer_key));
EditTextPreference autoAnswerTime =
(EditTextPreference) findPreference(getString(R.string.pref_auto_answer_time_key));
CheckBoxPreference rfc2833 = CheckBoxPreference rfc2833 =
(CheckBoxPreference) findPreference(getString(R.string.pref_rfc2833_dtmf_key)); (CheckBoxPreference) findPreference(getString(R.string.pref_rfc2833_dtmf_key));
CheckBoxPreference sipInfo = CheckBoxPreference sipInfo =
@ -1133,18 +1099,17 @@ public class SettingsFragment extends PreferencesListFragment {
EditTextPreference incTimeout = EditTextPreference incTimeout =
(EditTextPreference) (EditTextPreference)
findPreference(getString(R.string.pref_incoming_call_timeout_key)); 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()); rfc2833.setChecked(mPrefs.useRfc2833Dtmfs());
sipInfo.setChecked(mPrefs.useSipInfoDtmfs()); sipInfo.setChecked(mPrefs.useSipInfoDtmfs());
deviceRingtone.setChecked(mPrefs.isDeviceRingtoneEnabled()); deviceRingtone.setChecked(mPrefs.isDeviceRingtoneEnabled());
incomingCallVibration.setChecked(mPrefs.isIncomingCallVibrationEnabled()); incomingCallVibration.setChecked(mPrefs.isIncomingCallVibrationEnabled());
autoAnswer.setChecked(mPrefs.isAutoAnswerEnabled());
incTimeout.setText(String.valueOf(mPrefs.getIncTimeout())); incTimeout.setText(String.valueOf(mPrefs.getIncTimeout()));
incTimeout.setSummary(String.valueOf(mPrefs.getIncTimeout())); incTimeout.setSummary(String.valueOf(mPrefs.getIncTimeout()));
autoAnswer.setChecked(mPrefs.isAutoAnswerEnabled());
autoAnswerTime.setText(String.valueOf(mPrefs.getAutoAnswerTime())); autoAnswerTime.setText(String.valueOf(mPrefs.getAutoAnswerTime()));
autoAnswerTime.setSummary(String.valueOf(mPrefs.getAutoAnswerTime())); autoAnswerTime.setSummary(String.valueOf(mPrefs.getAutoAnswerTime()));
if (mPrefs.isAutoAnswerEnabled()) { if (mPrefs.isAutoAnswerEnabled()) {
autoAnswerTime.setEnabled(true); autoAnswerTime.setEnabled(true);
} else { } 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() { private void initChatSettings() {
setPreferenceDefaultValueAndSummary( setPreferenceDefaultValueAndSummary(
R.string.pref_image_sharing_server_key, mPrefs.getSharingPictureServerUrl()); R.string.pref_image_sharing_server_key, mPrefs.getSharingPictureServerUrl());
initLimeEncryptionPreference(
(ListPreference) findPreference(getString(R.string.pref_use_lime_encryption_key)));
initAutoDownloadPolicyPreference( initAutoDownloadPolicyPreference(
(ListPreference) findPreference(getString(R.string.pref_auto_download_policy_key))); (ListPreference) findPreference(getString(R.string.pref_auto_download_policy_key)));
int max_size = mPrefs.getAutoDownloadFileMaxSize(); 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)) findPreference(getString(R.string.pref_android_app_notif_settings_key))
.setOnPreferenceClickListener( .setOnPreferenceClickListener(
new OnPreferenceClickListener() { 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)) findPreference(getString(R.string.pref_transport_use_random_ports_key))
.setOnPreferenceChangeListener( .setOnPreferenceChangeListener(
new OnPreferenceChangeListener() { new OnPreferenceChangeListener() {

2
app/src/main/res/values/non_localizable_strings.xml
View file

@ -87,7 +87,7 @@
<string name="pref_friendlist_subscribe_key">pref_friendlist_subscribe_key</string> <string name="pref_friendlist_subscribe_key">pref_friendlist_subscribe_key</string>
<string name="pref_link_account_key">pref_link_account_key</string> <string name="pref_link_account_key">pref_link_account_key</string>
<string name="pref_proxy_push_notif_key">pref_proxy_push_notif_key</string> <string name="pref_proxy_push_notif_key">pref_proxy_push_notif_key</string>
<string name="pref_device_power_saver_settings_key">pref_huawei_protected_settings_key</string> <string name="pref_device_power_saver_settings_key">pref_device_power_saver_settings_key</string>
<string name="pref_echo_cancellation_key">pref_echo_cancellation_key</string> <string name="pref_echo_cancellation_key">pref_echo_cancellation_key</string>
<string name="pref_autostart_key">pref_autostart_key</string> <string name="pref_autostart_key">pref_autostart_key</string>
<string name="pref_enable_outbound_proxy_key">Outbound proxy</string> <string name="pref_enable_outbound_proxy_key">Outbound proxy</string>

91
app/src/main/res/xml/preferences.xml
View file

@ -133,6 +133,14 @@
android:summary="@string/pref_video_automatically_accept_video" android:summary="@string/pref_video_automatically_accept_video"
android:title="@string/pref_video_automatically_accept_video_title" /> android:title="@string/pref_video_automatically_accept_video_title" />
<CheckBoxPreference
android:dependency="@string/pref_video_enable_key"
android:key="@string/pref_overlay_key"
android:persistent="false"
android:shouldDisableView="true"
android:summary="@string/pref_overlay_summary"
android:title="@string/pref_overlay" />
<ListPreference <ListPreference
android:dependency="@string/pref_video_enable_key" android:dependency="@string/pref_video_enable_key"
android:entries="@array/video_preset_entries" android:entries="@array/video_preset_entries"
@ -164,14 +172,6 @@
android:shouldDisableView="true" android:shouldDisableView="true"
android:title="@string/pref_bandwidth_limit" /> android:title="@string/pref_bandwidth_limit" />
<CheckBoxPreference
android:dependency="@string/pref_video_enable_key"
android:key="@string/pref_overlay_key"
android:persistent="false"
android:shouldDisableView="true"
android:summary="@string/pref_overlay_summary"
android:title="@string/pref_overlay" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
@ -251,12 +251,6 @@
android:title="@string/pref_chat_title"> android:title="@string/pref_chat_title">
<PreferenceCategory android:title="@string/pref_chat_title"> <PreferenceCategory android:title="@string/pref_chat_title">
<ListPreference
android:key="@string/pref_use_lime_encryption_key"
android:persistent="false"
android:title="@string/pref_use_lime_encryption" />
<EditTextPreference <EditTextPreference
android:inputType="textUri" android:inputType="textUri"
android:key="@string/pref_image_sharing_server_key" android:key="@string/pref_image_sharing_server_key"
@ -297,6 +291,33 @@
android:persistent="false" android:persistent="false"
android:title="@string/pref_wifi_only" /> android:title="@string/pref_wifi_only" />
<CheckBoxPreference
android:key="@string/pref_ipv6_key"
android:persistent="false"
android:title="@string/pref_ipv6_title" />
<CheckBoxPreference
android:key="@string/pref_push_notification_key"
android:persistent="false"
android:title="@string/pref_push_notification" />
<Preference
android:key="@string/pref_device_power_saver_settings_key"
android:persistent="false"
android:summary="@string/pref_protected_settings_desc"
android:title="@string/pref_protected_settings_title" />
<CheckBoxPreference
android:key="@string/pref_transport_use_random_ports_key"
android:persistent="false"
android:title="@string/pref_transport_use_random_ports" />
<EditTextPreference
android:key="@string/pref_sip_port_key"
android:numeric="integer"
android:persistent="false"
android:title="@string/pref_sip_port_title" />
<EditTextPreference <EditTextPreference
android:inputType="textUri" android:inputType="textUri"
android:key="@string/pref_stun_server_key" android:key="@string/pref_stun_server_key"
@ -325,22 +346,6 @@
android:persistent="false" android:persistent="false"
android:title="@string/pref_turn_passwd_title" /> android:title="@string/pref_turn_passwd_title" />
<CheckBoxPreference
android:key="@string/pref_upnp_enable_key"
android:persistent="false"
android:title="@string/pref_upnp_enable" />
<CheckBoxPreference
android:key="@string/pref_transport_use_random_ports_key"
android:persistent="false"
android:title="@string/pref_transport_use_random_ports" />
<EditTextPreference
android:key="@string/pref_sip_port_key"
android:numeric="integer"
android:persistent="false"
android:title="@string/pref_sip_port_title" />
<EditTextPreference <EditTextPreference
android:key="@string/pref_audio_port_key" android:key="@string/pref_audio_port_key"
android:layout="@layout/hidden" android:layout="@layout/hidden"
@ -355,22 +360,6 @@
android:summary="@string/pref_video_port_description" android:summary="@string/pref_video_port_description"
android:title="@string/pref_video_port_title" /> android:title="@string/pref_video_port_title" />
<CheckBoxPreference
android:key="@string/pref_push_notification_key"
android:persistent="false"
android:title="@string/pref_push_notification" />
<Preference
android:key="@string/pref_device_power_saver_settings_key"
android:persistent="false"
android:summary="@string/pref_protected_settings_desc"
android:title="@string/pref_protected_settings_title" />
<CheckBoxPreference
android:key="@string/pref_ipv6_key"
android:persistent="false"
android:title="@string/pref_ipv6_title" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>
@ -415,6 +404,11 @@
android:persistent="false" android:persistent="false"
android:title="@string/pref_autostart" /> android:title="@string/pref_autostart" />
<CheckBoxPreference
android:key="@string/pref_dark_mode_key"
android:persistent="false"
android:title="@string/pref_dark_mode" />
<EditTextPreference <EditTextPreference
android:inputType="textUri" android:inputType="textUri"
android:key="@string/pref_remote_provisioning_key" android:key="@string/pref_remote_provisioning_key"
@ -426,11 +420,6 @@
android:persistent="false" android:persistent="false"
android:title="@string/pref_android_app_settings_title" /> android:title="@string/pref_android_app_settings_title" />
<CheckBoxPreference
android:key="@string/pref_dark_mode_key"
android:persistent="false"
android:title="@string/pref_dark_mode" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_primary_account_title"> <PreferenceCategory android:title="@string/pref_primary_account_title">