summaryrefslogtreecommitdiff
path: root/vdrmanager
diff options
context:
space:
mode:
Diffstat (limited to 'vdrmanager')
-rw-r--r--vdrmanager/res/xml/vdr_prefs.xml1
-rw-r--r--vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/vdrmanager/res/xml/vdr_prefs.xml b/vdrmanager/res/xml/vdr_prefs.xml
index 3720db4..041a08e 100644
--- a/vdrmanager/res/xml/vdr_prefs.xml
+++ b/vdrmanager/res/xml/vdr_prefs.xml
@@ -28,7 +28,6 @@
android:title="@string/vdr_password_title" />
<CheckBoxPreference
- android:enabled="false"
android:key="@string/vdr_ssl_key"
android:summary="@string/vdr_ssl_summary"
android:title="@string/vdr_ssl_title" />
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java b/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java
index 755d75c..fcdf585 100644
--- a/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java
@@ -205,7 +205,7 @@ public abstract class SvdrpClient<Result> {
// connect
informListener(SvdrpEvent.CONNECTING);
- if (true || Preferences.get().isSecure()) {
+ if (Preferences.get().isSecure()) {
socket = new MySSLSocketFactory(true).createSocket();
} else {
socket = new Socket();