From bb3dde69833747115b1c2d5d97e6879b29f322c6 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Wed, 20 Jul 2011 11:52:09 +0200
Subject: [PATCH] Enable TLS option

---
 res/xml/preferences.xml                            | 2 +-
 src/org/linphone/LinphoneManager.java              | 2 +-
 src/org/linphone/LinphonePreferencesActivity.java  | 2 +-
 src/org/linphone/core/LinphoneCoreFactoryImpl.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index b468f3ed4..ceeb8ba56 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -131,7 +131,7 @@
 			<CheckBoxPreference android:key="@string/pref_transport_tcp_key"
 			 android:title="@string/pref_transport_tcp" />
 			<CheckBoxPreference android:key="@string/pref_transport_tls_key"
-			 android:title="@string/pref_transport_tls" android:layout="@layout/hidden"/>
+			 android:title="@string/pref_transport_tls" />
 			<CheckBoxPreference android:key="@string/pref_transport_use_standard_ports_key"
 				 android:title="@string/pref_transport_use_standard_ports"/>
 		</PreferenceScreen>
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 526f95040..477b70017 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -532,7 +532,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		if (!getBool(R.string.pref_transport_tls_key, false)) {
 			ports.tls = 0;
 		} else if (useStandardPort) {
-			ports.tls = 5060;
+			ports.tls = 5061;
 		} else if (ports.tls==0) {
 			ports.tls=lPreviousPort;
 		}
diff --git a/src/org/linphone/LinphonePreferencesActivity.java b/src/org/linphone/LinphonePreferencesActivity.java
index 2717256cd..ea2084c65 100644
--- a/src/org/linphone/LinphonePreferencesActivity.java
+++ b/src/org/linphone/LinphonePreferencesActivity.java
@@ -123,7 +123,7 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
 		final List<CheckBoxPreference> checkboxes = Arrays.asList(
 				findCheckbox(R.string.pref_transport_udp_key)
 				,findCheckbox(R.string.pref_transport_tcp_key)
-//				,findCheckbox(R.string.pref_transport_tls_key)
+				,findCheckbox(R.string.pref_transport_tls_key)
 				);
 		
 
diff --git a/src/org/linphone/core/LinphoneCoreFactoryImpl.java b/src/org/linphone/core/LinphoneCoreFactoryImpl.java
index 6301c5c70..7e8f6e5de 100644
--- a/src/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/src/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -37,7 +37,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 		loadOptionalLibrary("swscale");
 		loadOptionalLibrary("avcore");
 		loadOptionalLibrary("avcodec");
-
+ 
 		// OPENSSL (cryptography)
 		// lin prefix avoids collision with libs in /system/lib
 		loadOptionalLibrary("lincrypto");