diff options
author | bju <bju@maxi.fritz.box> | 2014-01-22 02:28:34 +0100 |
---|---|---|
committer | bju <bju@maxi.fritz.box> | 2014-01-22 02:28:34 +0100 |
commit | 321bebe669a5aafc2c4ff0e9f59e60de2fa79bac (patch) | |
tree | f8b81b463027a60481f8f41939eaa5a18824ce19 /vdrmanager | |
parent | bc2c9e64787d4682bd9f3a3340f8b46497f63bb3 (diff) | |
download | vdr-manager-321bebe669a5aafc2c4ff0e9f59e60de2fa79bac.tar.gz vdr-manager-321bebe669a5aafc2c4ff0e9f59e60de2fa79bac.tar.bz2 |
http://projects.vdr-developer.org/issues/1267:
- some fixes on client side certificate validation
- added SSL server side support to the plugin
Diffstat (limited to 'vdrmanager')
-rw-r--r-- | vdrmanager/res/values-de/strings.xml | 2 | ||||
-rw-r--r-- | vdrmanager/res/values-it/strings.xml | 2 | ||||
-rw-r--r-- | vdrmanager/res/values-uk/strings.xml | 2 | ||||
-rw-r--r-- | vdrmanager/res/values/strings.xml | 2 | ||||
-rw-r--r-- | vdrmanager/res/xml/vdr_prefs.xml | 2 | ||||
-rw-r--r-- | vdrmanager/src/de/bjusystems/vdrmanager/gui/CertificateProblemDialog.java | 9 | ||||
-rw-r--r-- | vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java | 1 |
7 files changed, 14 insertions, 6 deletions
diff --git a/vdrmanager/res/values-de/strings.xml b/vdrmanager/res/values-de/strings.xml index 811cd02..e39997e 100644 --- a/vdrmanager/res/values-de/strings.xml +++ b/vdrmanager/res/values-de/strings.xml @@ -125,7 +125,7 @@ herrlado<herrlado@gmail.com></string> <string name="vdr_password_title">VDR Plugin Passwort</string> <string name="vdr_password_summary">Passwort für das VDR Plugin</string> <string name="vdr_ssl_title">Sichere Verbindung</string> - <string name="vdr_ssl_summary">Verwende SSL für Verbindungen (aktuell nicht implementiert)</string> + <string name="vdr_ssl_summary">Verwende SSL für Verbindungen</string> <string name="channel_filter_preferences">Kanaleinstellungen</string> <string name="channel_filter_filter_title">Begrenze Kanäle</string> <string name="channel_filter_filter_summary">Nur ausgewählte Kanäle verwenden</string> diff --git a/vdrmanager/res/values-it/strings.xml b/vdrmanager/res/values-it/strings.xml index 876c7ee..5f5425f 100644 --- a/vdrmanager/res/values-it/strings.xml +++ b/vdrmanager/res/values-it/strings.xml @@ -124,7 +124,7 @@ <string name="vdr_password_title">Password plugin VDR</string> <string name="vdr_password_summary">Password per il plugin di VDR</string> <string name="vdr_ssl_title">Connessione sicura</string> - <string name="vdr_ssl_summary">Usa SSL per le connessioni (al momento non supportato)</string> + <string name="vdr_ssl_summary">Usa SSL per le connessioni</string> <string name="channel_filter_preferences">Impostazioni canale</string> <string name="channel_filter_filter_title">Limita canali</string> <string name="channel_filter_filter_summary">Usa solo determinati canali</string> diff --git a/vdrmanager/res/values-uk/strings.xml b/vdrmanager/res/values-uk/strings.xml index 10e2fd8..b32c461 100644 --- a/vdrmanager/res/values-uk/strings.xml +++ b/vdrmanager/res/values-uk/strings.xml @@ -120,7 +120,7 @@ herrlado<herrlado@gmail.com> <string name="vdr_password_title">Пароль додатку VDR</string> <string name="vdr_password_summary">Пароль для додатка VDR</string> <string name="vdr_ssl_title">Безпечне підключення</string> - <string name="vdr_ssl_summary">Використовувати SSL для підключень (в даний час не підтримується)</string> + <string name="vdr_ssl_summary">Використовувати SSL для підключень</string> <string name="channel_filter_preferences">Налаштування каналу</string> <string name="channel_filter_filter_title">Обмеження на канали</string> <string name="channel_filter_filter_summary">Вокористовувати тільки дані канали</string> diff --git a/vdrmanager/res/values/strings.xml b/vdrmanager/res/values/strings.xml index 6169ccf..30f6108 100644 --- a/vdrmanager/res/values/strings.xml +++ b/vdrmanager/res/values/strings.xml @@ -144,7 +144,7 @@ <string name="vdr_password_title">VDR plugin password</string> <string name="vdr_password_summary">Password for the VDR plugin</string> <string name="vdr_ssl_title">Secure connect</string> - <string name="vdr_ssl_summary">Use SSL for connections (currently not supported)</string> + <string name="vdr_ssl_summary">Use SSL for connections</string> <!-- channel filter preferences --> <string name="channel_filter_preferences">Channel settings</string> diff --git a/vdrmanager/res/xml/vdr_prefs.xml b/vdrmanager/res/xml/vdr_prefs.xml index f53c19a..4cbd861 100644 --- a/vdrmanager/res/xml/vdr_prefs.xml +++ b/vdrmanager/res/xml/vdr_prefs.xml @@ -29,7 +29,7 @@ <CheckBoxPreference android:key="@string/vdr_ssl_key" - android:enabled="false" + android:enabled="true" android:summary="@string/vdr_ssl_summary" android:title="@string/vdr_ssl_title" /> </PreferenceCategory> diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/CertificateProblemDialog.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/CertificateProblemDialog.java index bf7034f..b0c58df 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/CertificateProblemDialog.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/CertificateProblemDialog.java @@ -32,7 +32,14 @@ public class CertificateProblemDialog implements CertificateProblemListener { final Semaphore semaphore = new Semaphore(0, true); // certificate properties - final String host = chain[0].getSubjectDN().getName().split(",")[0].replace("CN=", "").trim(); + final String[] values = chain[0].getSubjectDN().getName().split(","); + String host = "???"; + for(String value : values) { + if (value.contains("CN=")) { + host = value.replace("CN=", "").trim(); + break; + } + } final String creationDate = chain[0].getNotBefore().toLocaleString(); final String validUntil = chain[0].getNotAfter().toLocaleString(); diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java b/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java index daf2bea..9171bcb 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java @@ -301,6 +301,7 @@ public abstract class SvdrpClient<Result> { protected void disconnect() throws IOException { informListener(SvdrpEvent.DISCONNECTING); if (socket != null && socket.isConnected()) { + writeLine("quit"); socket.close(); socket = null; } |