diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory index 982a552fc..0b0a6c92c 100644 --- a/res/raw/linphonerc_factory +++ b/res/raw/linphonerc_factory @@ -29,4 +29,5 @@ dtmf_player_amp=0.1 [misc] max_calls=10 -log_collection_upload_server_url=https://www.linphone.org:444/lft.php \ No newline at end of file +log_collection_upload_server_url=https://www.linphone.org:444/lft.php +user_certificates_path=/data/data/org.linphone/files \ No newline at end of file diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java index 92a1c7866..8c0fc659d 100644 --- a/src/org/linphone/SettingsFragment.java +++ b/src/org/linphone/SettingsFragment.java @@ -394,6 +394,7 @@ public class SettingsFragment extends PreferencesListFragment { boolean hasZrtp = lc.mediaEncryptionSupported(MediaEncryption.ZRTP); boolean hasSrtp = lc.mediaEncryptionSupported(MediaEncryption.SRTP); boolean hasDtls = lc.mediaEncryptionSupported(MediaEncryption.DTLS); + if (!hasSrtp && !hasZrtp && !hasDtls) { pref.setEnabled(false); } else { @@ -845,6 +846,8 @@ public class SettingsFragment extends PreferencesListFragment { menc = MediaEncryption.SRTP; else if (value.equals(getString(R.string.pref_media_encryption_key_zrtp))) menc = MediaEncryption.ZRTP; + else if (value.equals(getString(R.string.pref_media_encryption_key_dtls))) + menc = MediaEncryption.DTLS; mPrefs.setMediaEncryption(menc); preference.setSummary(mPrefs.getMediaEncryption().toString()); diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java index 60d619e3a..7a3862829 100644 --- a/src/org/linphone/StatusFragment.java +++ b/src/org/linphone/StatusFragment.java @@ -134,6 +134,7 @@ public class StatusFragment extends Fragment { }); } // setMiniLedsForEachAccount(); + populateSliderContent(); populateSliderContent(); sliderContentAccounts.invalidate(); } catch (IllegalStateException ise) {} @@ -419,7 +420,7 @@ public class StatusFragment extends Fragment { background.setVisibility(View.VISIBLE); } - if (mediaEncryption == MediaEncryption.SRTP || (mediaEncryption == MediaEncryption.ZRTP && call.isAuthenticationTokenVerified())) { + if (mediaEncryption == MediaEncryption.SRTP || (mediaEncryption == MediaEncryption.ZRTP && call.isAuthenticationTokenVerified()) || mediaEncryption == MediaEncryption.DTLS) { encryption.setImageResource(R.drawable.security_ok); } else if (mediaEncryption == MediaEncryption.ZRTP && !call.isAuthenticationTokenVerified()) { encryption.setImageResource(R.drawable.security_pending);