From 6924066b0596e490ba66613fe0dc5b4c85d65d40 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 31 Jan 2017 18:01:54 +0100 Subject: [PATCH] Fix set Zrtp when we enable lime --- src/org/linphone/SettingsFragment.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java index 166010922..2661af288 100644 --- a/src/org/linphone/SettingsFragment.java +++ b/src/org/linphone/SettingsFragment.java @@ -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() { setPreferenceDefaultValueAndSummary(R.string.pref_image_sharing_server_key, mPrefs.getSharingPictureServerUrl()); initLimeEncryptionPreference((ListPreference) findPreference(getString(R.string.pref_use_lime_encryption_key))); @@ -988,10 +993,10 @@ public class SettingsFragment extends PreferencesListFragment { if (lime == LinphoneLimeState.Disabled) { preference.setSummary(getString(R.string.lime_encryption_entry_disabled)); } else if (lime == LinphoneLimeState.Mandatory) { - mPrefs.setMediaEncryption(MediaEncryption.ZRTP); + setEncryptionZrtp(); preference.setSummary(getString(R.string.lime_encryption_entry_mandatory)); } else if (lime == LinphoneLimeState.Preferred) { - mPrefs.setMediaEncryption(MediaEncryption.ZRTP); + setEncryptionZrtp(); preference.setSummary(getString(R.string.lime_encryption_entry_preferred)); }