diff options
| author | bju <bju@maxi.fritz.box> | 2013-04-07 23:54:56 +0200 |
|---|---|---|
| committer | bju <bju@maxi.fritz.box> | 2013-04-07 23:54:56 +0200 |
| commit | da538379e940113d6f5775823f0d41f343582b90 (patch) | |
| tree | ae8fda87834d7d1cd2d4aa9b29e2165a1530a294 | |
| parent | 4b463c74709701f2328d314811974a30a6e54e17 (diff) | |
| download | vdr-manager-da538379e940113d6f5775823f0d41f343582b90.tar.gz vdr-manager-da538379e940113d6f5775823f0d41f343582b90.tar.bz2 | |
SSL option enabled
| -rw-r--r-- | vdrmanager/res/xml/vdr_prefs.xml | 1 | ||||
| -rw-r--r-- | vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java | 2 |
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(); |