From bc38b75e9e014aa6a0100dcd60cbc004f3d448e9 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 23 Feb 2015 11:15:04 +0100
Subject: [PATCH] Add DTLS setting

---
 res/values/non_localizable_strings.xml |  2 ++
 src/org/linphone/SettingsFragment.java | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index f9eddf7b3..c399ded77 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -97,6 +97,7 @@
     <string name="pref_media_encryption_key_none">none</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_dtls">dtls</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_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="media_encryption_srtp">SRTP</string>
 	<string name="media_encryption_zrtp">ZRTP</string>
+    <string name="media_encryption_dtls">DTLS</string>
 </resources>
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index d0e685f91..92a1c7866 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -393,7 +393,8 @@ public class SettingsFragment extends PreferencesListFragment {
 
 		boolean hasZrtp = lc.mediaEncryptionSupported(MediaEncryption.ZRTP);
 		boolean hasSrtp = lc.mediaEncryptionSupported(MediaEncryption.SRTP);
-		if (!hasSrtp && !hasZrtp) {
+		boolean hasDtls = lc.mediaEncryptionSupported(MediaEncryption.DTLS);
+		if (!hasSrtp && !hasZrtp && !hasDtls) {
 			pref.setEnabled(false);
 		} else {
 			if (hasSrtp){
@@ -404,6 +405,11 @@ public class SettingsFragment extends PreferencesListFragment {
 				entries.add(getString(R.string.media_encryption_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);
 		}
 
@@ -415,6 +421,8 @@ public class SettingsFragment extends PreferencesListFragment {
 			key = getString(R.string.pref_media_encryption_key_srtp);
 		else if (value.toString().equals(getString(R.string.media_encryption_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);
 	}