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

Add DTLS setting

Browse source
This commit is contained in:
Margaux Clerc 2015-02-23 11:15:04 +01:00
parent 470e1446d9
commit bc38b75e9e
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/values/non_localizable_strings.xml
View file

@ -97,6 +97,7 @@
<string name="pref_media_encryption_key_none">none</string> <string name="pref_media_encryption_key_none">none</string>
<string name="pref_media_encryption_key_srtp">srtp</string> <string name="pref_media_encryption_key_srtp">srtp</string>
<string name="pref_media_encryption_key_zrtp">zrtp</string> <string name="pref_media_encryption_key_zrtp">zrtp</string>
<string name="pref_media_encryption_key_dtls">dtls</string>
<string name="pref_background_mode_key">pref_background_mode_key</string> <string name="pref_background_mode_key">pref_background_mode_key</string>
<string name="pref_codec_bitrate_limit_key">pref_codec_bitrate_limit_key</string> <string name="pref_codec_bitrate_limit_key">pref_codec_bitrate_limit_key</string>
<string name="pref_adaptive_rate_control_key">pref_adaptive_rate_control_key</string> <string name="pref_adaptive_rate_control_key">pref_adaptive_rate_control_key</string>
@ -167,4 +168,5 @@
<string name="pref_video_codec_vp8_title">VP8</string> <string name="pref_video_codec_vp8_title">VP8</string>
<string name="media_encryption_srtp">SRTP</string> <string name="media_encryption_srtp">SRTP</string>
<string name="media_encryption_zrtp">ZRTP</string> <string name="media_encryption_zrtp">ZRTP</string>
<string name="media_encryption_dtls">DTLS</string>
</resources> </resources>

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

@ -393,7 +393,8 @@ public class SettingsFragment extends PreferencesListFragment {
boolean hasZrtp = lc.mediaEncryptionSupported(MediaEncryption.ZRTP); boolean hasZrtp = lc.mediaEncryptionSupported(MediaEncryption.ZRTP);
boolean hasSrtp = lc.mediaEncryptionSupported(MediaEncryption.SRTP); boolean hasSrtp = lc.mediaEncryptionSupported(MediaEncryption.SRTP);
if (!hasSrtp && !hasZrtp) { boolean hasDtls = lc.mediaEncryptionSupported(MediaEncryption.DTLS);
if (!hasSrtp && !hasZrtp && !hasDtls) {
pref.setEnabled(false); pref.setEnabled(false);
} else { } else {
if (hasSrtp){ if (hasSrtp){
@ -404,6 +405,11 @@ public class SettingsFragment extends PreferencesListFragment {
entries.add(getString(R.string.media_encryption_zrtp)); entries.add(getString(R.string.media_encryption_zrtp));
values.add(getString(R.string.pref_media_encryption_key_zrtp)); values.add(getString(R.string.pref_media_encryption_key_zrtp));
} }
if (hasDtls){
entries.add(getString(R.string.media_encryption_dtls));
values.add(getString(R.string.pref_media_encryption_key_dtls));
}
setListPreferenceValues(pref, entries, values); setListPreferenceValues(pref, entries, values);
} }
@ -415,6 +421,8 @@ public class SettingsFragment extends PreferencesListFragment {
key = getString(R.string.pref_media_encryption_key_srtp); key = getString(R.string.pref_media_encryption_key_srtp);
else if (value.toString().equals(getString(R.string.media_encryption_zrtp))) else if (value.toString().equals(getString(R.string.media_encryption_zrtp)))
key = getString(R.string.pref_media_encryption_key_zrtp); key = getString(R.string.pref_media_encryption_key_zrtp);
else if (value.toString().equals(getString(R.string.media_encryption_dtls)))
key = getString(R.string.pref_media_encryption_key_dtls);
pref.setValue(key); pref.setValue(key);
} }