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

Fix set Zrtp when we enable lime

Browse source
This commit is contained in:
Erwan Croze 2017-01-31 18:01:54 +01:00
parent 760cf3a6e4
commit 6924066b05
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/org/linphone/SettingsFragment.java
View file

@ -957,6 +957,11 @@ public class SettingsFragment extends PreferencesListFragment {
}); });
} }
private void setEncryptionZrtp() {
mPrefs.setMediaEncryption(MediaEncryption.ZRTP);
findPreference(getString(R.string.pref_media_encryption_key)).setSummary(mPrefs.getMediaEncryption().toString());
}
private void initChatSettings() { private void initChatSettings() {
setPreferenceDefaultValueAndSummary(R.string.pref_image_sharing_server_key, mPrefs.getSharingPictureServerUrl()); setPreferenceDefaultValueAndSummary(R.string.pref_image_sharing_server_key, mPrefs.getSharingPictureServerUrl());
initLimeEncryptionPreference((ListPreference) findPreference(getString(R.string.pref_use_lime_encryption_key))); initLimeEncryptionPreference((ListPreference) findPreference(getString(R.string.pref_use_lime_encryption_key)));
@ -988,10 +993,10 @@ public class SettingsFragment extends PreferencesListFragment {
if (lime == LinphoneLimeState.Disabled) { if (lime == LinphoneLimeState.Disabled) {
preference.setSummary(getString(R.string.lime_encryption_entry_disabled)); preference.setSummary(getString(R.string.lime_encryption_entry_disabled));
} else if (lime == LinphoneLimeState.Mandatory) { } else if (lime == LinphoneLimeState.Mandatory) {
mPrefs.setMediaEncryption(MediaEncryption.ZRTP); setEncryptionZrtp();
preference.setSummary(getString(R.string.lime_encryption_entry_mandatory)); preference.setSummary(getString(R.string.lime_encryption_entry_mandatory));
} else if (lime == LinphoneLimeState.Preferred) { } else if (lime == LinphoneLimeState.Preferred) {
mPrefs.setMediaEncryption(MediaEncryption.ZRTP); setEncryptionZrtp();
preference.setSummary(getString(R.string.lime_encryption_entry_preferred)); preference.setSummary(getString(R.string.lime_encryption_entry_preferred));
} }